| Index: branches/REL1_17/phase3/includes/GlobalFunctions.php |
| — | — | @@ -1341,10 +1341,11 @@ |
| 1342 | 1342 | /** |
| 1343 | 1343 | * Sets dest to source and returns the original value of dest |
| 1344 | 1344 | * If source is NULL, it just returns the value, it doesn't set the variable |
| | 1345 | + * If force is true, it will set the value even if source is NULL |
| 1345 | 1346 | */ |
| 1346 | | -function wfSetVar( &$dest, $source ) { |
| | 1347 | +function wfSetVar( &$dest, $source, $force = false ) { |
| 1347 | 1348 | $temp = $dest; |
| 1348 | | - if ( !is_null( $source ) ) { |
| | 1349 | + if ( !is_null( $source ) || $force ) { |
| 1349 | 1350 | $dest = $source; |
| 1350 | 1351 | } |
| 1351 | 1352 | return $temp; |
| Index: branches/REL1_17/phase3/includes/parser/ParserOptions.php |
| — | — | @@ -125,7 +125,7 @@ |
| 126 | 126 | function setTidy( $x ) { return wfSetVar( $this->mTidy, $x); } |
| 127 | 127 | function setSkin( $x ) { $this->mSkin = $x; } |
| 128 | 128 | function setInterfaceMessage( $x ) { return wfSetVar( $this->mInterfaceMessage, $x); } |
| 129 | | - function setTargetLanguage( $x ) { return wfSetVar( $this->mTargetLanguage, $x); } |
| | 129 | + function setTargetLanguage( $x ) { return wfSetVar( $this->mTargetLanguage, $x, true ); } |
| 130 | 130 | function setMaxIncludeSize( $x ) { return wfSetVar( $this->mMaxIncludeSize, $x ); } |
| 131 | 131 | function setMaxPPNodeCount( $x ) { return wfSetVar( $this->mMaxPPNodeCount, $x ); } |
| 132 | 132 | function setMaxTemplateDepth( $x ) { return wfSetVar( $this->mMaxTemplateDepth, $x ); } |
| Property changes on: branches/REL1_17/phase3/includes/parser/ParserOptions.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 133 | 133 | Merged /branches/REL1_15/phase3/includes/parser/ParserOptions.php:r51646 |
| 134 | 134 | Merged /branches/sqlite/includes/parser/ParserOptions.php:r58211-58321 |
| 135 | 135 | Merged /trunk/phase3/includes/parser/ParserOptions.php:r82474,82845,82847-82848,85752,88134 |
| 136 | 136 | Merged /branches/new-installer/phase3/includes/parser/ParserOptions.php:r43664-66004 |
| 137 | 137 | Merged /branches/wmf-deployment/includes/parser/ParserOptions.php:r53381 |
| Index: branches/REL1_17/phase3/includes/MessageCache.php |
| — | — | @@ -677,8 +677,9 @@ |
| 678 | 678 | $popts = $this->getParserOptions(); |
| 679 | 679 | $popts->setInterfaceMessage( $interface ); |
| 680 | 680 | $popts->setTargetLanguage( $language ); |
| 681 | | - $popts->setUserLang( $language ); |
| | 681 | + $userlang = $popts->setUserLang( $language ); |
| 682 | 682 | $message = $this->mParser->transformMsg( $message, $popts ); |
| | 683 | + $popts->setUserLang( $userlang ); |
| 683 | 684 | } |
| 684 | 685 | return $message; |
| 685 | 686 | } |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -39,6 +39,8 @@ |
| 40 | 40 | * (bug 29535) Added missing Creative Commons CC0 icon. |
| 41 | 41 | * (bug 29726) Fixed failure to load internationalization messages in |
| 42 | 42 | client-side scripts on WebKit-based browsers. |
| | 43 | +* Fixed a bug in message transformation where the previous language could leak |
| | 44 | + into later transformations in the UI language. |
| 43 | 45 | |
| 44 | 46 | === Changes since 1.17.0rc1 === |
| 45 | 47 | |