Code cleanup: unused globals, empty statements, typos...

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a298a48..b8d99b8 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2332,7 +2332,7 @@ class OutputPage {
         * @return String: HTML fragment
         */
        function getHeadScripts( Skin $sk ) {
-               global $wgUser, $wgRequest, $wgJsMimeType;
+               global $wgUser, $wgRequest;
                global $wgUseSiteJs;
                
                // Statup - this will immediately load jquery and mediawiki modules

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index 5b679cc..6fb4c78 100644 (file)
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -903,7 +903,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
        
        protected function getConfig( $context ) {
                global $wgLoadScript, $wgScript, $wgStylePath, $wgScriptExtension, $wgArticlePath, $wgScriptPath, $wgServer,
-                       $wgContLang, $wgBreakFrames, $wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgAjaxWatch, $wgVersion,
+                       $wgContLang, $wgBreakFrames, $wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgVersion,
                        $wgEnableAPI, $wgEnableWriteAPI, $wgDBname, $wgEnableMWSuggest, $wgSitename, $wgFileExtensions;
 
                // Pre-process information
@@ -963,7 +963,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
        /* Methods */
 
        public function getScript( ResourceLoaderContext $context ) {
-               global $IP, $wgStylePath, $wgLoadScript;
+               global $IP, $wgLoadScript;
 
                $scripts = file_get_contents( "$IP/resources/startup.js" );
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 527e659..dbce2af 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -481,7 +481,7 @@ class Skin extends Linker {
         * @private
         */
        function setupUserCss( OutputPage $out ) {
-               global $wgRequest, $wgUser;
+               global $wgRequest;
                global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs, $wgSquidMaxage;
 
                wfProfileIn( __METHOD__ );

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 6ed2ef1..e991975 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -237,7 +237,7 @@ abstract class DatabaseUpdater {
 
        /**
         * Get an array of updates to perform on the database. Should return a
-        * mutli-dimensional array. The main key is the MediaWiki version (1.12,
+        * multi-dimensional array. The main key is the MediaWiki version (1.12,
         * 1.13...) with the values being arrays of updates, identical to how
         * updaters.inc did it (for now)
         *

diff --git a/includes/media/PNG.php b/includes/media/PNG.php
index fb912c4..0a7fc32 100644 (file)
--- a/includes/media/PNG.php
+++ b/includes/media/PNG.php
@@ -68,7 +68,7 @@ class PNGHandler extends BitmapHandler {
                if ($metadata['loopCount'] == 0)
                        $info[] = wfMsgExt( 'file-info-png-looped', 'parseinline' );
                elseif ($metadata['loopCount'] > 1)
-                       $info[] = wfMsgExt( 'file-info-png-repeat', 'parseinline', $metadata['loopCount'] );;
+                       $info[] = wfMsgExt( 'file-info-png-repeat', 'parseinline', $metadata['loopCount'] );
                
                if ($metadata['frameCount'] > 0)
                        $info[] = wfMsgExt( 'file-info-png-frames', 'parseinline', $metadata['frameCount'] );

diff --git a/includes/parser/DateFormatter.php b/includes/parser/DateFormatter.php
index a6fb7df..cf51017 100644 (file)
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -271,7 +271,7 @@ class DateFormatter
                        $isoBits[] = $bits['y'];
                $isoBits[] = $bits['m'];
                $isoBits[] = $bits['d'];
-               $isoDate = implode( '-', $isoBits );;
+               $isoDate = implode( '-', $isoBits );
                
                // Output is not strictly HTML (it's wikitext), but <span> is whitelisted.
                $text = Html::rawElement( 'span',

diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index 98630e9..ec600c0 100644 (file)
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -680,7 +680,7 @@ class Preprocessor_Hash implements Preprocessor {
                
                // Cache
                if ($cacheable) {
-                       $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . serialize( $rootNode );;
+                       $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . serialize( $rootNode );
                        $wgMemc->set( $cacheKey, $cacheValue, 86400 );
                        wfProfileOut( __METHOD__.'-cache-miss' );
                        wfProfileOut( __METHOD__.'-cacheable' );

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 2c90ae1..8af9ac4 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -272,7 +272,7 @@ class LoginForm {
                # Request forgery checks.
                if ( !self::getCreateaccountToken() ) {
                        self::setCreateaccountToken();
-                       $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) );;
+                       $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) );
                        return false;
                }