http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88811
Revision: 88811
Author: ialex
Date: 2011-05-25 18:37:32 +0000 (Wed, 25 May 2011)
Log Message:
-----------
Also change $wgLanguageCode along with $wgContLang, this was breaking when
arriving at LanguageConverterTest with "nooo!"
Modified Paths:
--------------
trunk/phase3/tests/phpunit/includes/ExtraParserTest.php
trunk/phase3/tests/phpunit/includes/GlobalTest.php
Modified: trunk/phase3/tests/phpunit/includes/ExtraParserTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/ExtraParserTest.php 2011-05-25
18:32:04 UTC (rev 88810)
+++ trunk/phase3/tests/phpunit/includes/ExtraParserTest.php 2011-05-25
18:37:32 UTC (rev 88811)
@@ -9,8 +9,10 @@
global $wgMemc;
global $wgContLang;
global $wgShowDBErrorBacktrace;
+ global $wgLanguageCode;
$wgShowDBErrorBacktrace = true;
+ $wgLanguageCode = 'en';
$wgContLang = new Language( 'en' );
$wgMemc = new EmptyBagOStuff;
Modified: trunk/phase3/tests/phpunit/includes/GlobalTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/GlobalTest.php 2011-05-25 18:32:04 UTC
(rev 88810)
+++ trunk/phase3/tests/phpunit/includes/GlobalTest.php 2011-05-25 18:37:32 UTC
(rev 88811)
@@ -2,12 +2,13 @@
class GlobalTest extends MediaWikiTestCase {
function setUp() {
- global $wgReadOnlyFile, $wgContLang, $wgLang, $wgUrlProtocols;
+ global $wgReadOnlyFile, $wgContLang, $wgLang, $wgUrlProtocols,
$wgLanguageCode;
$this->originals['wgReadOnlyFile'] = $wgReadOnlyFile;
$this->originals['wgUrlProtocols'] = $wgUrlProtocols;
$wgReadOnlyFile = tempnam( wfTempDir(), "mwtest_readonly" );
$wgUrlProtocols[] = 'file://';
unlink( $wgReadOnlyFile );
+ $wgLanguageCode = 'en';
$wgContLang = $wgLang = Language::factory( 'en' );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
