From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 19 Jan 2012 10:05:38 +0000 (+0000)
Subject: $wgLanguageCode goes with $wgContLang, not $wgLang. This was breaking ApiBlockTest... 
X-Git-Tag: 1.31.0-rc.0~25190
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=de67af20d01592521ce1c727ebe1d2c62f6d8bf2;p=lhc%2Fweb%2Fwiklou.git

$wgLanguageCode goes with $wgContLang, not $wgLang. This was breaking ApiBlockTest because $wgContLang->getCode() != $wgLanguageCode.
---

diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index a9817f35e1..f722dfc54a 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -4,17 +4,15 @@ class XmlTest extends MediaWikiTestCase {
 	private static $oldLang;
 
 	public function setUp() {
-		global $wgLang, $wgLanguageCode;
+		global $wgLang;
 
 		self::$oldLang = $wgLang;
-		$wgLanguageCode = 'en';
-		$wgLang = Language::factory( $wgLanguageCode );
+		$wgLang = Language::factory( 'en' );
 	}
 
 	public function tearDown() {
-		global $wgLang, $wgLanguageCode;
+		global $wgLang;
 		$wgLang = self::$oldLang;
-		$wgLanguageCode = $wgLang->getCode();
 	}
 
 	public function testExpandAttributes() {