Merge "Add a parser test for $wgNoFollowDomainExceptions functionality"

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

diff --git a/includes/Message.php b/includes/Message.php
index 8ac73b3..c204aee 100644 (file)
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -388,6 +388,7 @@ class Message implements MessageSpecifier, Serializable {
         * @param string|array|MessageSpecifier $value
         * @return Message
         * @throws InvalidArgumentException
+        * @since 1.27
         */
        public static function newFromSpecifier( $value ) {
                if ( $value instanceof RawMessage ) {
@@ -446,12 +447,12 @@ class Message implements MessageSpecifier, Serializable {
        public function getTitle() {
                global $wgContLang, $wgForceUIMsgAsContentMsg;
 
-               $code = $this->getLanguage()->getCode();
                $title = $this->key;
                if (
-                       $wgContLang->getCode() !== $code
+                       !$this->language->equals( $wgContLang )
                        && in_array( $this->key, (array)$wgForceUIMsgAsContentMsg )
                ) {
+                       $code = $this->language->getCode();
                        $title .= '/' . $code;
                }