My proposed fix to bug 34987: gender not working in many special pages.

[lhc/web/wiklou.git] / includes / SpecialPage.php

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index c9c6f02..3f8b88e 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -768,7 +768,15 @@ class SpecialPage {
                // Works fine as the first parameter, which appears elsewhere in the
                // code base. Sighhhh.
                $args = func_get_args();
-               return call_user_func_array( array( $this->getContext(), 'msg' ), $args );
+               $message = call_user_func_array( array( $this->getContext(), 'msg' ), $args );
+               // RequestContext passes context to wfMessage, and the language is set from
+               // the context, but setting the language for Message class removes the
+               // interface message status, which breaks for example usernameless gender
+               // invokations. Restore the flag when not including special page in content.
+               if ( !$this->including() ) {
+                       $message->setInterfaceMessageFlag( true );
+               }
+               return $message;
        }
 
        /**