Merge "Revert "merged master"" into Wikidata

diff --combined tests/phpunit/includes/ExtraParserTest.php
index 903a6d2,a9088cb..11a6604
--- 1/tests/phpunit/includes/ExtraParserTest.php
--- 2/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@@ -21,8 -21,6 +21,8 @@@ class ExtraParserTest extends MediaWiki
                $this->options = new ParserOptions;
                $this->options->setTemplateCallback( array( __CLASS__, 'statelessFetchTemplate' ) );
                $this->parser = new Parser;
 +
 +              MagicWord::clearCache();
        }
  
        // Bug 8689 - Long numeric lines kill the parser
@@@ -148,7 -146,7 +148,7 @@@
         */
        function testTrackingCategory() {
                $title = Title::newFromText( __FUNCTION__ );
-               $catName =  wfMessage( 'broken-file-category' )->inContentLanguage()->text();
+               $catName =  wfMsgForContent( 'broken-file-category' );
                $cat = Title::makeTitleSafe( NS_CATEGORY, $catName );
                $expected = array( $cat->getDBkey() );
                $parserOutput = $this->parser->parse( "[[file:nonexistent]]" , $title, $this->options );