https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112872
Revision: 112872
Author: tstarling
Date: 2012-03-02 04:00:58 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Fix for r86304: if MessageCache::parse() is called twice, once with
$interface=true and then with $interface=false, actually use $interface=false
the second time instead of using the cached value from the previous call. Same
for $language. This is the reason why edittools was affected by bug 34832.
Modified Paths:
--------------
trunk/phase3/includes/cache/MessageCache.php
Modified: trunk/phase3/includes/cache/MessageCache.php
===================================================================
--- trunk/phase3/includes/cache/MessageCache.php 2012-03-02 03:20:36 UTC
(rev 112871)
+++ trunk/phase3/includes/cache/MessageCache.php 2012-03-02 04:00:58 UTC
(rev 112872)
@@ -834,14 +834,9 @@
$parser = $this->getParser();
$popts = $this->getParserOptions();
+ $popts->setInterfaceMessage( $interface );
+ $popts->setTargetLanguage( $language );
- if ( $interface ) {
- $popts->setInterfaceMessage( true );
- }
- if ( $language !== null ) {
- $popts->setTargetLanguage( $language );
- }
-
wfProfileIn( __METHOD__ );
if ( !$title || !$title instanceof Title ) {
global $wgTitle;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
