Merge "(bug 42030) Include original URL params in variant links"

[lhc/web/wiklou.git] / tests / phpunit / includes / logging / LogFormatterTest.php

diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php b/tests/phpunit/includes/logging/LogFormatterTest.php
index 427be07..2fa2cc0 100755 (executable)
--- a/tests/phpunit/includes/logging/LogFormatterTest.php
+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
@@ -43,6 +43,13 @@ class LogFormatterTest extends MediaWikiLangTestCase {
                $this->context->setLanguage( $wgLang );
        }
 
+       protected function tearDown() {
+               parent::tearDown();
+
+               global $wgLang;
+               $wgLang->getLocalisationCache()->recache( $wgLang->getCode() );
+       }
+
        public function newLogEntry( $action, $params ) {
                $logEntry = new ManualLogEntry( 'phpunit', $action );
                $logEntry->setPerformer( $this->user );
@@ -60,11 +67,11 @@ class LogFormatterTest extends MediaWikiLangTestCase {
                $formatter->setContext( $this->context );
 
                $formatter->setShowUserToolLinks( false );
-               $paramsWithoutTools = $formatter->getMessageParameters();
+               $paramsWithoutTools = $formatter->getMessageParametersForTesting();
                unset( $formatter->parsedParameters );
 
                $formatter->setShowUserToolLinks( true );
-               $paramsWithTools = $formatter->getMessageParameters();
+               $paramsWithTools = $formatter->getMessageParametersForTesting();
 
                $userLink = Linker::userLink(
                        $this->user->getId(),