From bbc5937dea83ccb6d9c44771bcabb73621435b71 Mon Sep 17 00:00:00 2001 From: Platonides Date: Wed, 8 Sep 2010 20:38:20 +0000 Subject: [PATCH] Initialise wgContLang and $wgLang. Follow up r72566. --- maintenance/tests/phpunit/bootstrap.php | 2 +- maintenance/tests/phpunit/includes/GlobalTest.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/maintenance/tests/phpunit/bootstrap.php b/maintenance/tests/phpunit/bootstrap.php index 650fe4c97d..60c117cbdb 100644 --- a/maintenance/tests/phpunit/bootstrap.php +++ b/maintenance/tests/phpunit/bootstrap.php @@ -73,4 +73,4 @@ abstract class MediaWikiTestSetup extends PHPUnit_Framework_TestCase { return null; } } -} \ No newline at end of file +} diff --git a/maintenance/tests/phpunit/includes/GlobalTest.php b/maintenance/tests/phpunit/includes/GlobalTest.php index 8dc666070e..75d229b6b9 100644 --- a/maintenance/tests/phpunit/includes/GlobalTest.php +++ b/maintenance/tests/phpunit/includes/GlobalTest.php @@ -2,10 +2,11 @@ class GlobalTest extends PHPUnit_Framework_TestCase { function setUp() { - global $wgReadOnlyFile; + global $wgReadOnlyFile, $wgContLang, $wgLang; $this->originals['wgReadOnlyFile'] = $wgReadOnlyFile; $wgReadOnlyFile = tempnam( wfTempDir(), "mwtest_readonly" ); unlink( $wgReadOnlyFile ); + $wgContLang = $wgLang = Language::factory( 'en' ); } function tearDown() { -- 2.20.1