Make parser->getFunctionLang be dependent on title->getPageLanguage() instead of...

[lhc/web/wiklou.git] / includes / parser / CoreParserFunctions.php

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 403e7a3..67abb10 100644 (file)
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -269,27 +269,30 @@ class CoreParserFunctions {
 
        /**
         * @param $parser Parser
-        * @param $user User
+        * @param $username string
         * @return
         */
-       static function gender( $parser, $user ) {
+       static function gender( $parser, $username ) {
                wfProfileIn( __METHOD__ );
                $forms = array_slice( func_get_args(), 2);
 
+               $username = trim( $username );
+
                // default
                $gender = User::getDefaultOption( 'gender' );
 
                // allow prefix.
-               $title = Title::newFromText( $user );
+               $title = Title::newFromText( $username );
 
-               if ( is_object( $title ) && $title->getNamespace() == NS_USER )
-                       $user = $title->getText();
+               if ( $title && $title->getNamespace() == NS_USER ) {
+                       $username = $title->getText();
+               }
 
                // check parameter, or use the ParserOptions if in interface message
-               $user = User::newFromName( $user );
+               $user = User::newFromName( $username );
                if ( $user ) {
                        $gender = $user->getOption( 'gender' );
-               } elseif ( $parser->getOptions()->getInterfaceMessage() ) {
+               } elseif ( $username === '' && $parser->getOptions()->getInterfaceMessage() ) {
                        $gender = $parser->getOptions()->getUser()->getOption( 'gender' );
                }
                $ret = $parser->getFunctionLang()->gender( $gender, $forms );
@@ -442,10 +445,11 @@ class CoreParserFunctions {
                        return '';
                return wfUrlencode( $t->getSubjectNsText() );
        }
-       /*
+
+       /**
         * Functions to get and normalize pagenames, corresponding to the magic words
         * of the same names
-       */
+        */
        static function pagename( $parser, $title = null ) {
                $t = Title::newFromText( $title );
                if ( is_null( $t ) )