| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -514,7 +514,6 @@ |
| 515 | 515 | return $this->mNamespaceIds; |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | | - |
| 519 | 518 | /** |
| 520 | 519 | * Get a namespace key by value, case insensitive. Canonical namespace |
| 521 | 520 | * names override custom ones defined for the current language. |
| — | — | @@ -524,7 +523,8 @@ |
| 525 | 524 | */ |
| 526 | 525 | function getNsIndex( $text ) { |
| 527 | 526 | $lctext = $this->lc( $text ); |
| 528 | | - if ( ( $ns = MWNamespace::getCanonicalIndex( $lctext ) ) !== null ) { |
| | 527 | + $ns = MWNamespace::getCanonicalIndex( $lctext ); |
| | 528 | + if ( $ns !== null ) { |
| 529 | 529 | return $ns; |
| 530 | 530 | } |
| 531 | 531 | $ids = $this->getNamespaceIds(); |
| — | — | @@ -543,7 +543,9 @@ |
| 544 | 544 | list( $rootCode ) = explode( '-', $code ); |
| 545 | 545 | if( $usemsg && wfMessage( $msg )->exists() ) { |
| 546 | 546 | return $this->getMessageFromDB( $msg ); |
| 547 | | - } elseif( $name = self::getLanguageName( $code ) ) { |
| | 547 | + } |
| | 548 | + $name = self::getLanguageName( $code ); |
| | 549 | + if( $name ) { |
| 548 | 550 | return $name; # if it's defined as a language name, show that |
| 549 | 551 | } else { |
| 550 | 552 | # otherwise, output the language code |
| Index: trunk/extensions/CategoryBrowser/CategoryBrowser.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | $wgExtensionAliasesFiles['CategoryBrowser'] = $dir . '/CategoryBrowser.alias.php'; |
| 58 | 58 | $wgSpecialPages['CategoryBrowser'] = 'CategoryBrowserPage'; |
| 59 | 59 | $wgSpecialPageGroups['CategoryBrowser'] = 'pages'; |
| 60 | | - |
| | 60 | + |
| 61 | 61 | CB_Setup::init(); |
| 62 | 62 | |
| 63 | 63 | class CB_Setup { |
| — | — | @@ -95,11 +95,7 @@ |
| 96 | 96 | */ |
| 97 | 97 | static function init() { |
| 98 | 98 | global $wgScriptPath; |
| 99 | | - global $wgExtensionMessagesFiles; |
| 100 | 99 | global $wgAutoloadClasses; |
| 101 | | - global $wgExtensionCredits; |
| 102 | | - global $wgSpecialPages; |
| 103 | | - global $wgSpecialPageGroups; |
| 104 | 100 | global $wgAjaxExportList; |
| 105 | 101 | |
| 106 | 102 | self::$ExtDir = str_replace( "\\", "/", dirname( __FILE__ ) ); |
| Index: trunk/extensions/ExtensionManagement/specials/SpecialExtensionManagement.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | static $viewvcUrls = array( |
| 17 | 17 | 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki' => 'http://svn.wikimedia.org/viewvc/mediawiki', |
| 18 | 18 | 'http://svn.wikimedia.org/svnroot/mediawiki' => 'http://svn.wikimedia.org/viewvc/mediawiki', |
| 19 | | - # Doesn't work at the time of writing but maybe some day: |
| | 19 | + # Doesn't work at the time of writing but maybe some day: |
| 20 | 20 | 'https://svn.wikimedia.org/viewvc/mediawiki' => 'http://svn.wikimedia.org/viewvc/mediawiki', |
| 21 | 21 | ); |
| 22 | 22 | |
| — | — | @@ -43,10 +43,8 @@ |
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | function displayExtensions() { |
| 47 | | - global $wgOut, $wgExtensionCredits; |
| | 47 | + global $wgExtensionCredits; |
| 48 | 48 | |
| 49 | | - $extensionAmount = 0; |
| 50 | | - |
| 51 | 49 | $extensionTypes = array( |
| 52 | 50 | 'specialpage' => wfMsg( 'version-specialpages' ), |
| 53 | 51 | 'parserhook' => wfMsg( 'version-parserhooks' ), |
| — | — | @@ -125,8 +123,8 @@ |
| 126 | 124 | } |
| 127 | 125 | # Version |
| 128 | 126 | if ( isset( $extension['version'] ) ) { |
| 129 | | - $versionText = '<span class="mw-version-ext-version"><em>' . |
| 130 | | - wfMsg( 'version-version', $extension['version'] ) . |
| | 127 | + $versionText = '<span class="mw-version-ext-version"><em>' . |
| | 128 | + wfMsg( 'version-version', $extension['version'] ) . |
| 131 | 129 | '</em></span> | '; |
| 132 | 130 | } else { |
| 133 | 131 | $versionText = ''; |
| — | — | @@ -203,7 +201,7 @@ |
| 204 | 202 | } else { |
| 205 | 203 | if( is_object( $list[0] ) ) |
| 206 | 204 | $class = get_class( $list[0] ); |
| 207 | | - else |
| | 205 | + else |
| 208 | 206 | $class = $list[0]; |
| 209 | 207 | return "($class, {$list[1]})"; |
| 210 | 208 | } |