fixing per comments at r70517

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index f35d020..f28b92d 100644 (file)
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -86,7 +86,7 @@ class CoreParserFunctions {
        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;

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 9758639..dcd0bad 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -103,9 +103,11 @@ class ParserOptions {
                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;