| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -481,7 +481,7 @@ |
| 482 | 482 | * @private |
| 483 | 483 | */ |
| 484 | 484 | function setupUserCss( OutputPage $out ) { |
| 485 | | - global $wgRequest, $wgUser; |
| | 485 | + global $wgRequest; |
| 486 | 486 | global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs, $wgSquidMaxage; |
| 487 | 487 | |
| 488 | 488 | wfProfileIn( __METHOD__ ); |
| Index: trunk/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -237,7 +237,7 @@ |
| 238 | 238 | |
| 239 | 239 | /** |
| 240 | 240 | * Get an array of updates to perform on the database. Should return a |
| 241 | | - * mutli-dimensional array. The main key is the MediaWiki version (1.12, |
| | 241 | + * multi-dimensional array. The main key is the MediaWiki version (1.12, |
| 242 | 242 | * 1.13...) with the values being arrays of updates, identical to how |
| 243 | 243 | * updaters.inc did it (for now) |
| 244 | 244 | * |
| Index: trunk/phase3/includes/ResourceLoaderModule.php |
| — | — | @@ -903,7 +903,7 @@ |
| 904 | 904 | |
| 905 | 905 | protected function getConfig( $context ) { |
| 906 | 906 | global $wgLoadScript, $wgScript, $wgStylePath, $wgScriptExtension, $wgArticlePath, $wgScriptPath, $wgServer, |
| 907 | | - $wgContLang, $wgBreakFrames, $wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgAjaxWatch, $wgVersion, |
| | 907 | + $wgContLang, $wgBreakFrames, $wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgVersion, |
| 908 | 908 | $wgEnableAPI, $wgEnableWriteAPI, $wgDBname, $wgEnableMWSuggest, $wgSitename, $wgFileExtensions; |
| 909 | 909 | |
| 910 | 910 | // Pre-process information |
| — | — | @@ -963,7 +963,7 @@ |
| 964 | 964 | /* Methods */ |
| 965 | 965 | |
| 966 | 966 | public function getScript( ResourceLoaderContext $context ) { |
| 967 | | - global $IP, $wgStylePath, $wgLoadScript; |
| | 967 | + global $IP, $wgLoadScript; |
| 968 | 968 | |
| 969 | 969 | $scripts = file_get_contents( "$IP/resources/startup.js" ); |
| 970 | 970 | |
| Index: trunk/phase3/includes/media/PNG.php |
| — | — | @@ -68,7 +68,7 @@ |
| 69 | 69 | if ($metadata['loopCount'] == 0) |
| 70 | 70 | $info[] = wfMsgExt( 'file-info-png-looped', 'parseinline' ); |
| 71 | 71 | elseif ($metadata['loopCount'] > 1) |
| 72 | | - $info[] = wfMsgExt( 'file-info-png-repeat', 'parseinline', $metadata['loopCount'] );; |
| | 72 | + $info[] = wfMsgExt( 'file-info-png-repeat', 'parseinline', $metadata['loopCount'] ); |
| 73 | 73 | |
| 74 | 74 | if ($metadata['frameCount'] > 0) |
| 75 | 75 | $info[] = wfMsgExt( 'file-info-png-frames', 'parseinline', $metadata['frameCount'] ); |
| Index: trunk/phase3/includes/parser/Preprocessor_Hash.php |
| — | — | @@ -680,7 +680,7 @@ |
| 681 | 681 | |
| 682 | 682 | // Cache |
| 683 | 683 | if ($cacheable) { |
| 684 | | - $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . serialize( $rootNode );; |
| | 684 | + $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . serialize( $rootNode ); |
| 685 | 685 | $wgMemc->set( $cacheKey, $cacheValue, 86400 ); |
| 686 | 686 | wfProfileOut( __METHOD__.'-cache-miss' ); |
| 687 | 687 | wfProfileOut( __METHOD__.'-cacheable' ); |
| Index: trunk/phase3/includes/parser/DateFormatter.php |
| — | — | @@ -271,7 +271,7 @@ |
| 272 | 272 | $isoBits[] = $bits['y']; |
| 273 | 273 | $isoBits[] = $bits['m']; |
| 274 | 274 | $isoBits[] = $bits['d']; |
| 275 | | - $isoDate = implode( '-', $isoBits );; |
| | 275 | + $isoDate = implode( '-', $isoBits ); |
| 276 | 276 | |
| 277 | 277 | // Output is not strictly HTML (it's wikitext), but <span> is whitelisted. |
| 278 | 278 | $text = Html::rawElement( 'span', |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -2332,7 +2332,7 @@ |
| 2333 | 2333 | * @return String: HTML fragment |
| 2334 | 2334 | */ |
| 2335 | 2335 | function getHeadScripts( Skin $sk ) { |
| 2336 | | - global $wgUser, $wgRequest, $wgJsMimeType; |
| | 2336 | + global $wgUser, $wgRequest; |
| 2337 | 2337 | global $wgUseSiteJs; |
| 2338 | 2338 | |
| 2339 | 2339 | // Statup - this will immediately load jquery and mediawiki modules |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -272,7 +272,7 @@ |
| 273 | 273 | # Request forgery checks. |
| 274 | 274 | if ( !self::getCreateaccountToken() ) { |
| 275 | 275 | self::setCreateaccountToken(); |
| 276 | | - $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) );; |
| | 276 | + $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) ); |
| 277 | 277 | return false; |
| 278 | 278 | } |
| 279 | 279 | |