Follow-up r113223: set the "interface" flag in Message to true by default and set...

The point is to have the fix applied to all usages of IContextSource::msg() calls instead of only SpecialPage.

diff --git a/includes/Message.php b/includes/Message.php
index 73914d7..7357ed7 100644 (file)
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -294,6 +294,7 @@ class Message {
        public function setContext( IContextSource $context ) {
                $this->inLanguage( $context->getLanguage() );
                $this->title( $context->getTitle() );
+               $this->interface = true;
 
                return $this;
        }

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 3f8b88e..411d5e4 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -773,8 +773,8 @@ class SpecialPage {
                // 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 );
+               if ( $this->including() ) {
+                       $message->setInterfaceMessageFlag( false );
                }
                return $message;
        }