Parser should only use content messages.

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 85873c5..251f938 100644 (file)
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -605,7 +605,7 @@ class CoreParserFunctions {
                        return '';
                else
                        return( '<span class="error">' .
-                               wfMsg( 'duplicate-defaultsort',
+                               wfMsgForContent( 'duplicate-defaultsort',
                                                 htmlspecialchars( $old ),
                                                 htmlspecialchars( $text ) ) .
                                '</span>' );
@@ -643,7 +643,7 @@ class CoreParserFunctions {
                $stripList = $parser->getStripList();
                if ( !in_array( $tagName, $stripList ) ) {
                        return '<span class="error">' .
-                               wfMsg( 'unknown_extension_tag', $tagName ) .
+                               wfMsgForContent( 'unknown_extension_tag', $tagName ) .
                                '</span>';
                }
 

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b1f97e5..04a5e1d 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1144,7 +1144,7 @@ class Parser {
                                throw new MWException( __METHOD__.': unrecognised match type "' .
                                        substr( $m[0], 0, 20 ) . '"' );
                        }
-                       $url = wfMsg( $urlmsg, $id);
+                       $url = wfMsgForContent( $urlmsg, $id);
                        $sk = $this->mOptions->getSkin( $this->mTitle );
                        $la = $sk->getExternalLinkAttributes( "external $CssClass" );
                        return "<a href=\"{$url}\"{$la}>{$keyword} {$id}</a>";
@@ -3407,13 +3407,13 @@ class Parser {
                global $wgEnableScaryTranscluding;
 
                if ( !$wgEnableScaryTranscluding ) {
-                       return wfMsg('scarytranscludedisabled');
+                       return wfMsgForContent('scarytranscludedisabled');
                }
 
                $url = $title->getFullUrl( "action=$action" );
 
                if ( strlen( $url ) > 255 ) {
-                       return wfMsg( 'scarytranscludetoolong' );
+                       return wfMsgForContent( 'scarytranscludetoolong' );
                }
                return $this->fetchScaryTemplateMaybeFromCache( $url );
        }
@@ -3430,7 +3430,7 @@ class Parser {
 
                $text = Http::get( $url );
                if ( !$text ) {
-                       return wfMsg( 'scarytranscludefailed', $url );
+                       return wfMsgForContent( 'scarytranscludefailed', $url );
                }
 
                $dbw = wfGetDB( DB_MASTER );