From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Sat, 23 Oct 2010 03:01:47 +0000 (+0000)
Subject: re r70916: avoid resetting $wgMemc which leads to failures for me
X-Git-Tag: 1.31.0-rc.0~34381
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=14586970b4753c0376fc017581dd49f17bb76d6b;p=lhc%2Fweb%2Fwiklou.git

re r70916: avoid resetting $wgMemc which leads to failures for me
---

diff --git a/maintenance/tests/phpunit/includes/TitlePermissionTest.php b/maintenance/tests/phpunit/includes/TitlePermissionTest.php
index a3270fa35c..4e910dd8ad 100644
--- a/maintenance/tests/phpunit/includes/TitlePermissionTest.php
+++ b/maintenance/tests/phpunit/includes/TitlePermissionTest.php
@@ -12,7 +12,9 @@ class TitlePermissionTest extends PHPUnit_Framework_TestCase {
 	function setUp() {
 		global $wgLocaltimezone, $wgLocalTZoffset, $wgMemc, $wgContLang, $wgLang, $wgMessageCache;
 
-		$wgMemc = new FakeMemCachedClient;
+		if(!$wgMemc) {
+			$wgMemc = new FakeMemCachedClient;
+		}
 		$wgMessageCache = new MessageCache( $wgMemc, true, 3600 );
 		$wgContLang = $wgLang = Language::factory( 'en' );
 
@@ -45,8 +47,8 @@ class TitlePermissionTest extends PHPUnit_Framework_TestCase {
 	}
 
 	function tearDown() {
-		global $wgMemc, $wgContLang, $wgLang;
-		$wgMemc = $wgContLang = $wgLang = null;
+		global $wgContLang, $wgLang;
+		$wgContLang = $wgLang = null;
 	}
 
 	function setUserPerm( $perm ) {