Follow-up r72349.

Remove unused globals $wgStylePath, $wgStyleVersion, $wgUser and the no longer used $wgJQueryOnEveryPage.

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index dfd2b93..d37a1bd 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -601,7 +601,7 @@ class EnhancedChangesList extends ChangesList {
         * @return String
         */
        public function beginRecentChangesList() {
-               global $wgStylePath, $wgStyleVersion, $wgOut;
+               global $wgOut;
                $this->rc_cache = array();
                $this->rcMoveIndex = 0;
                $this->rcCacheIndex = 0;

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 9239d4d..4184128 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -156,7 +156,7 @@ class HTMLForm {
        static function addJS() {
                if ( self::$jsAdded ) return;
 
-               global $wgOut, $wgStylePath;
+               global $wgOut;
 
                $wgOut->addModules( 'mediawiki.legacy.htmlform' );
        }

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index db18b1d..717817c 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -750,6 +750,7 @@ class MessageCache {
                        # Invalidate all local caches
                        $this->mMemc->delete( wfMemcKey( 'messages', $code, 'hash' ) );
                }
+               $this->mLoadedLanguages = array();
        }
 
        /**
@@ -811,7 +812,7 @@ class MessageCache {
        }
 
        public function figureMessage( $key ) {
-               global $wgContLanguageCode, $wgContLang;
+               global $wgContLanguageCode;
                $pieces = explode( '/', $key );
                if( count( $pieces ) < 2 )
                        return array( $key, $wgContLanguageCode );

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8154d03..dea03f3 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1565,7 +1565,7 @@ class OutputPage {
                global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
                global $wgUseAjax, $wgAjaxWatch;
                global $wgEnableMWSuggest, $wgUniversalEditButton;
-               global $wgArticle, $wgJQueryOnEveryPage;
+               global $wgArticle;
 
                if( $this->mDoNothing ) {
                        return;
@@ -2301,7 +2301,7 @@ class OutputPage {
         */
        function getHeadScripts( Skin $sk ) {
                global $wgUser, $wgRequest, $wgJsMimeType;
-               global $wgStylePath, $wgStyleVersion, $wgUseSiteJs;
+               global $wgUseSiteJs;
                
                // Statup - this will immediately load jquery and mediawiki modules
                $scripts = self::makeResourceLoaderLink( $sk, 'startup', 'scripts' );

diff --git a/includes/ResourceLoaderContext.php b/includes/ResourceLoaderContext.php
index 3052b5f..264a834 100644 (file)
--- a/includes/ResourceLoaderContext.php
+++ b/includes/ResourceLoaderContext.php
@@ -38,7 +38,7 @@ class ResourceLoaderContext {
        /* Methods */
 
        public function __construct( WebRequest $request, $server ) {
-               global $wgUser, $wgLang, $wgDefaultSkin;
+               global $wgLang, $wgDefaultSkin;
 
                $this->request = $request;
                $this->server = $server;

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 9527846..76118a3 100644 (file)
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -579,7 +579,7 @@ CONTROL;
         * Add style sheets and supporting JS for diff display.
         */
        function showDiffStyle() {
-               global $wgStylePath, $wgStyleVersion, $wgOut;
+               global $wgOut;
                $wgOut->addModules( 'mediawiki.legacy.diff' );
        }
 

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index e060cf9..f3c9044 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -195,7 +195,6 @@ class IPBlockForm extends SpecialPage {
                        wfMsgForContent( 'ipbreason-dropdown' ),
                        wfMsgForContent( 'ipbreasonotherlist' ), $this->BlockReasonList, 'wpBlockDropDown', 4 );
 
-               global $wgStylePath, $wgStyleVersion;
                $wgOut->addModules( 'mediawiki.legacy.block' );
                $wgOut->addHTML(
                        Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ), 'id' => 'blockip' ) ) .