Follow up r89585. Clean up after the test, expand inContentLanguage() comment.

diff --git a/includes/Message.php b/includes/Message.php
index 531712f..87349ff 100644 (file)
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -224,7 +224,8 @@ class Message {
        }
 
        /**
-        * Request the message in the wiki's content language.
+        * Request the message in the wiki's content language,
+        * unless it is disabled for this message.
         * @see $wgForceUIMsgAsContentMsg
         * @return Message: $this
         */

diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index e1d15dc..45c02bb 100644 (file)
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -41,11 +41,16 @@ class MessageTest extends MediaWikiLangTestCase {
 
        function testInContentLanguage() {
                global $wgLang, $wgForceUIMsgAsContentMsg;
+               $oldLang = $wgLang;
                $wgLang = Language::factory( 'fr' );
 
-               $this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->inContentLanguage()->plain(), "ForceUIMsg disabled" );
-               $wgForceUIMsgAsContentMsg[] = 'mainpage';
+               $this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->inContentLanguage()->plain(), 'ForceUIMsg disabled' );
+               $wgForceUIMsgAsContentMsg['testInContentLanguage'] = 'mainpage';
                $this->assertEquals( 'Accueil', wfMessage( 'mainpage' )->inContentLanguage()->plain(), 'ForceUIMsg enabled' );
+               
+               /* Restore globals */
+               $wgLang = $oldLang;
+               unset( $wgForceUIMsgAsContentMsg['testInContentLanguage'] );
        }
 
        /**