Merge "Parse duplicate-defaultsort error message"

diff --combined includes/parser/CoreParserFunctions.php
index 8b513a6,41cbd08..2b84358
--- 1/includes/parser/CoreParserFunctions.php
--- 2/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@@ -377,7 -377,7 +377,7 @@@ class CoreParserFunctions 
  
                // disallow some styles that could be used to bypass $wgRestrictDisplayTitle
                if ( $wgRestrictDisplayTitle ) {
 -                      $htmlTagsCallback = function ( $params ) {
 +                      $htmlTagsCallback = function ( &$params ) {
                                $decoded = Sanitizer::decodeTagAttributes( $params );
  
                                if ( isset( $decoded['style'] ) ) {
@@@ -456,8 -456,7 +456,8 @@@
                return self::formatRaw( SiteStats::edits(), $raw );
        }
        static function numberofviews( $parser, $raw = null ) {
 -              return self::formatRaw( SiteStats::views(), $raw );
 +              global $wgDisableCounters;
 +              return !$wgDisableCounters ? self::formatRaw( SiteStats::views(), $raw ) : '';
        }
        static function pagesinnamespace( $parser, $namespace = 0, $raw = null ) {
                return self::formatRaw( SiteStats::pagesInNs( intval( $namespace ) ), $raw );
@@@ -863,7 -862,10 +863,10 @@@
                        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>';
                }
        }