From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 29 Nov 2010 00:26:40 +0000 (+0000)
Subject: Revert global removals in test/ from r77393
X-Git-Tag: 1.31.0-rc.0~33695
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=1efb09188727b61afb1375b71e3ab49b1740fe62;p=lhc%2Fweb%2Fwiklou.git

Revert global removals in test/ from r77393
---

diff --git a/maintenance/tests/parser/parserTest.inc b/maintenance/tests/parser/parserTest.inc
index 3ce0f5a64d..0d0a8917a9 100644
--- a/maintenance/tests/parser/parserTest.inc
+++ b/maintenance/tests/parser/parserTest.inc
@@ -120,9 +120,9 @@ class ParserTest {
 	}
 
 	static function setUp() {
-		global $wgParser,  $wgParserConf, $IP, $wgDeferredUpdateList,
+		global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgDeferredUpdateList,
 			$wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
-			$wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry,
+			$wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc,
 			$wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
 			$wgThumbnailScriptPath, $wgScriptPath,
 			$wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;
diff --git a/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php b/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php
index b3063a1a26..6629369ff0 100644
--- a/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -14,9 +14,9 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 	}
 
 	function setUp() {
-		global $wgParser, $wgParserConf, $IP, $wgDeferredUpdateList,
+		global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgDeferredUpdateList,
 				  $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
-				  $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry,
+				  $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc,
 				  $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
 				  $wgThumbnailScriptPath, $wgScriptPath,
 				  $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;