Initialise wgContLang and $wgLang.

Follow up r72566.

diff --git a/maintenance/tests/phpunit/bootstrap.php b/maintenance/tests/phpunit/bootstrap.php
index 650fe4c..60c117c 100644 (file)
--- 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 8dc6660..75d229b 100644 (file)
--- 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() {