From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 5 Aug 2011 15:10:08 +0000 (+0000)
Subject: $wgLanguageCode applies to $wgContLang, not $wgLang. This was breaking the test suite... 
X-Git-Tag: 1.31.0-rc.0~28411
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=1455fe4e21c9883cd8941fecda7a907c2df994d4;p=lhc%2Fweb%2Fwiklou.git

$wgLanguageCode applies to $wgContLang, not $wgLang. This was breaking the test suite by dying with a "nooo!" in when reaching LanguageConverterTest.
---

diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index b38ae18afc..7cd98d8816 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -3,19 +3,23 @@
 
 class HtmlTest extends MediaWikiTestCase {
 	private static $oldLang;
+	private static $oldContLang;
 
 	public function setUp() {
-		global $wgLang, $wgLanguageCode;
+		global $wgLang, $wgContLang, $wgLanguageCode;
 		
 		self::$oldLang = $wgLang;
+		self::$oldContLang = $wgContLang;
+		
 		$wgLanguageCode = 'en';
-		$wgLang = Language::factory( $wgLanguageCode );
+		$wgContLang = $wgLang = Language::factory( $wgLanguageCode );
 	}
 	
 	public function tearDown() {
-		global $wgLang, $wgLanguageCode;
+		global $wgLang, $wgContLang, $wgLanguageCode;
 		$wgLang = self::$oldLang;
-		$wgLanguageCode = $wgLang->getCode();
+		$wgContLang = self::$oldContLang;
+		$wgLanguageCode = $wgContLang->getCode();
 	}
 
 	public function testExpandAttributesSkipsNullAndFalse() {