From: Alex Monk <krenair@gmail.com>
Date: Sat, 15 Jun 2013 14:13:35 +0000 (+0100)
Subject: Parse duplicate-defaultsort error message
X-Git-Tag: 1.31.0-rc.0~19271^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=f7e1570030b3ffc566afe91ca6a851057f0af43a;p=lhc%2Fweb%2Fwiklou.git

Parse duplicate-defaultsort error message

Bug: 49611
Change-Id: I2fd6c74597ba423378c3f08e76248c2b241098dd
---

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index a7820d4b6a..41cbd08beb 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -862,7 +862,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>';
 		}
 	}