http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73960
Revision: 73960
Author: kaldari
Date: 2010-09-29 17:25:17 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
fixing per comments at r70517
Modified Paths:
--------------
trunk/phase3/includes/parser/CoreParserFunctions.php
trunk/phase3/includes/parser/ParserOptions.php
Modified: trunk/phase3/includes/parser/CoreParserFunctions.php
===================================================================
--- trunk/phase3/includes/parser/CoreParserFunctions.php 2010-09-29
17:19:37 UTC (rev 73959)
+++ trunk/phase3/includes/parser/CoreParserFunctions.php 2010-09-29
17:25:17 UTC (rev 73960)
@@ -86,7 +86,7 @@
static function intFunction( $parser, $part1 = '' /*, ... */ ) {
if ( strval( $part1 ) !== '' ) {
$args = array_slice( func_get_args(), 2 );
- $message = wfMsgGetKey( $part1, true,
$parser->mOptions->getUserLang(), false );
+ $message = wfMsgGetKey( $part1, true,
$parser->getOptions()->getUserLang(), false );
$message = wfMsgReplaceArgs( $message, $args );
$message = $parser->replaceVariables( $message ); //
like $wgMessageCache->transform()
return $message;
Modified: trunk/phase3/includes/parser/ParserOptions.php
===================================================================
--- trunk/phase3/includes/parser/ParserOptions.php 2010-09-29 17:19:37 UTC
(rev 73959)
+++ trunk/phase3/includes/parser/ParserOptions.php 2010-09-29 17:25:17 UTC
(rev 73960)
@@ -103,9 +103,11 @@
return $this->mTimestamp;
}
- # You shouldn't use this. Really. $parser->getFunctionLang() is all you
need.
- # Using this fragments the cache and is discouraged. Yes, {{int: }}
uses this,
- # producing inconsistent tables (Bug 14404).
+ /**
+ * You shouldn't use this. Really. $parser->getFunctionLang() is all
you need.
+ * Using this fragments the cache and is discouraged. Yes, {{int: }}
uses this,
+ * producing inconsistent tables (Bug 14404).
+ */
function getUserLang() {
$this->accessedOptions['userlang'] = true;
return $this->mUserLang;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
