Merge "Parse duplicate-defaultsort error message"

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 8b513a6..2b84358 100644 (file)
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -863,7 +863,10 @@ class CoreParserFunctions {
                        return '';
                } else {
                        return '<span class="error">' .
-                               wfMessage( 'duplicate-defaultsort', $old, $text )->inContentLanguage()->escaped() .
+                               wfMessage( 'duplicate-defaultsort',
+                                       wfEscapeWikiText( $old ), // Message should be parsed, but these params should only be escaped.
+                                       wfEscapeWikiText( $text )
+                               )->inContentLanguage()->text() .
                                '</span>';
                }
        }