From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 6 Jul 2011 17:58:29 +0000 (+0000)
Subject: Call parent::setUp() and allow it to do lang setup stuff
X-Git-Tag: 1.31.0-rc.0~29035
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=0989a2bcbce5e9918a6c1719e90ed890a05ba514;p=lhc%2Fweb%2Fwiklou.git

Call parent::setUp() and allow it to do lang setup stuff
---

diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
index 0ded96f172..383035611a 100644
--- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -3,13 +3,12 @@
 class GlobalTest extends MediaWikiTestCase {
 	function setUp() {
 		global $wgReadOnlyFile, $wgContLang, $wgLang, $wgUrlProtocols, $wgLanguageCode;
+		parent::setUp();
 		$this->originals['wgReadOnlyFile'] = $wgReadOnlyFile;
 		$this->originals['wgUrlProtocols'] = $wgUrlProtocols;
 		$wgReadOnlyFile = tempnam( wfTempDir(), "mwtest_readonly" );
 		$wgUrlProtocols[] = 'file://';
 		unlink( $wgReadOnlyFile );
-		$wgLanguageCode = 'en';
-		$wgContLang = $wgLang = Language::factory( 'en' );
 	}
 
 	function tearDown() {