| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php |
| — | — | @@ -614,7 +614,7 @@ |
| 615 | 615 | |
| 616 | 616 | // Handle new project name |
| 617 | 617 | $projectName = $wgRequest->getVal( 'project_name' ); |
| 618 | | - if ( $projectName ) { |
| | 618 | + if ( isset( $projectName ) ) { |
| 619 | 619 | $this->updateProjectName ( $notice, $projectName ); |
| 620 | 620 | } |
| 621 | 621 | |
| — | — | @@ -946,7 +946,7 @@ |
| 947 | 947 | |
| 948 | 948 | /** |
| 949 | 949 | * Lookup function for active banners under a given language and project. This function is |
| 950 | | - * called by SpecialNoticeText::getJsOutput() in order to build the static Javascript files for |
| | 950 | + * called by SpecialNoticeText::getOutput() in order to build the static Javascript files for |
| 951 | 951 | * each project. |
| 952 | 952 | * @return A 2D array of running banners with associated weights and settings |
| 953 | 953 | */ |
| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeLocal.php |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | return 7200; |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | | - function getJsOutput( $par ) { |
| | 16 | + function getOutput( $par ) { |
| 17 | 17 | $text = ''; |
| 18 | 18 | if ( $par == 'anonnotice.js' ) { |
| 19 | 19 | $text = wfGetCachedNotice( 'anonnotice' ); |
| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildTemplates.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | echo "$key\n"; |
| 32 | 32 | |
| 33 | 33 | $builder = new SpecialNoticeText(); |
| 34 | | - $js = $builder->getJsOutput( $key ); |
| | 34 | + $js = $builder->getOutput( $key ); |
| 35 | 35 | |
| 36 | 36 | if ( isset( $options['o'] ) ) { |
| 37 | 37 | $outputDir = "$wgNoticeCentralDirectory/$project/$lang"; |
| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/NoticePage.php |
| — | — | @@ -5,13 +5,13 @@ |
| 6 | 6 | global $wgOut; |
| 7 | 7 | $wgOut->disable(); |
| 8 | 8 | $this->sendHeaders(); |
| 9 | | - $js = $this->getJsOutput( $par ); |
| | 9 | + $content = $this->getOutput( $par ); |
| 10 | 10 | |
| 11 | | - if ( strlen( $js ) == 0 ) { |
| | 11 | + if ( strlen( $content ) == 0 ) { |
| 12 | 12 | /* Hack for IE/Mac 0-length keepalive problem, see RawPage.php */ |
| 13 | 13 | echo "/* Empty */"; |
| 14 | 14 | } else { |
| 15 | | - echo $js; |
| | 15 | + echo $content; |
| 16 | 16 | } |
| 17 | 17 | } |
| 18 | 18 | |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | // header( "Last-modified: $epoch" ); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | | - function getJsOutput( $par ) { |
| | 44 | + function getOutput( $par ) { |
| 45 | 45 | return ""; |
| 46 | 46 | } |
| 47 | 47 | } |
| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildLocalTemplates.php |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | echo "$wgDBname/$key\n"; |
| 24 | 24 | |
| 25 | 25 | $builder = new SpecialNoticeLocal(); |
| 26 | | - $js = $builder->getJsOutput( $key ); |
| | 26 | + $js = $builder->getOutput( $key ); |
| 27 | 27 | |
| 28 | 28 | $outputDir = $wgNoticeLocalDirectory; |
| 29 | 29 | if ( wfMkDirParents( $outputDir ) ) { |
| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeText.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | /** |
| 29 | 29 | * Given a project key, generate the body for a static Javascript file |
| 30 | 30 | */ |
| 31 | | - function getJsOutput( $par ) { |
| | 31 | + function getOutput( $par ) { |
| 32 | 32 | |
| 33 | 33 | // Break $par into separate parameters and assign to $this->project and $this->language |
| 34 | 34 | $this->setLanguage( $par ); |
| Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 35 | Merged /trunk/extensions/CentralNotice:r72058-72131 |