From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 15 Jun 2011 21:32:08 +0000 (+0000)
Subject: Followup 90161 (which breaks the test). Need to hack around to avoid a reload from db.
X-Git-Tag: 1.31.0-rc.0~29507
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=bbc37da45b9321a96e174db8a0e7e03d14688edd;p=lhc%2Fweb%2Fwiklou.git

Followup 90161 (which breaks the test). Need to hack around to avoid a reload from db.
---

diff --git a/tests/phpunit/includes/LanguageConverterTest.php b/tests/phpunit/includes/LanguageConverterTest.php
index 74a5a5ee3a..baf28b07fa 100644
--- a/tests/phpunit/includes/LanguageConverterTest.php
+++ b/tests/phpunit/includes/LanguageConverterTest.php
@@ -61,8 +61,8 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		global $wgUser;
 
 		$wgUser = new User;
-		$wgUser->setId( 1 );
-		$wgUser->mFrom = 'defaults';
+		$wgUser->load(); // from 'defaults'
+		$wgUser->mId = 1;
 		$wgUser->mDataLoaded = true;
 		$wgUser->mOptionsLoaded = true;
 		$wgUser->setOption( 'variant', 'tg-latn' );