From de67af20d01592521ce1c727ebe1d2c62f6d8bf2 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Thu, 19 Jan 2012 10:05:38 +0000 Subject: [PATCH] $wgLanguageCode goes with $wgContLang, not $wgLang. This was breaking ApiBlockTest because $wgContLang->getCode() != $wgLanguageCode. --- tests/phpunit/includes/XmlTest.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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() { -- 2.20.1