From: Liangent <liangent@gmail.com>
Date: Thu, 4 Jul 2013 19:15:05 +0000 (+0000)
Subject: Disable language conversion for echoed sortkeys in defaultsort errors.
X-Git-Tag: 1.31.0-rc.0~19269^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=0e57adabc378c184ea2c735bce9a6255bba57ef9;p=lhc%2Fweb%2Fwiklou.git

Disable language conversion for echoed sortkeys in defaultsort errors.

Change-Id: I24ac06687df126b59a3eddeb4ed00b2ca0ee22e9
---

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 2b84358bee..8246f71d68 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -862,10 +862,12 @@ class CoreParserFunctions {
 		if ( $old === false || $old == $text || $arg ) {
 			return '';
 		} else {
+			$converter = $parser->getConverterLanguage()->getConverter();
 			return '<span class="error">' .
 				wfMessage( 'duplicate-defaultsort',
-					wfEscapeWikiText( $old ), // Message should be parsed, but these params should only be escaped.
-					wfEscapeWikiText( $text )
+					// Message should be parsed, but these params should only be escaped.
+					$converter->markNoConversion( wfEscapeWikiText( $old ) ),
+					$converter->markNoConversion( wfEscapeWikiText( $text ) )
 				)->inContentLanguage()->text() .
 				'</span>';
 		}