From 0c52065dac7bed2d5530720e122b182d4af9aec2 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Sat, 4 Sep 2010 13:27:12 +0000
Subject: [PATCH] Follow-up r72349. Remove unused globals $wgStylePath,
 $wgStyleVersion, $wgUser and the no longer used $wgJQueryOnEveryPage.

---
 includes/ChangesList.php              | 2 +-
 includes/HTMLForm.php                 | 2 +-
 includes/MessageCache.php             | 3 ++-
 includes/OutputPage.php               | 4 ++--
 includes/ResourceLoaderContext.php    | 2 +-
 includes/diff/DifferenceInterface.php | 2 +-
 includes/specials/SpecialBlockip.php  | 1 -
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index dfd2b93e29..d37a1bd258 100644
--- 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 9239d4da6a..4184128fa4 100644
--- 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 db18b1d5a9..717817c4b2 100644
--- 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 8154d033e4..dea03f316f 100644
--- 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 3052b5fbf9..264a834006 100644
--- 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 9527846ef7..76118a32a8 100644
--- 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 e060cf9dbc..f3c9044cbe 100644
--- 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' ) ) .
-- 
2.20.1