From e31e85265f58c5529bc02f1aa099f442e8f475ba Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Sun, 2 Nov 2008 18:46:27 +0000
Subject: [PATCH] Fix for r43077: * Use wfMsg to show error message in user
 preference language. wfMsgForContent does not make sense * Rename new message
 name to MediaWiki code standards. Use dash and not underscore

---
 includes/parser/CoreParserFunctions.php | 4 ++--
 languages/messages/MessagesEn.php       | 2 +-
 languages/messages/MessagesHe.php       | 2 +-
 maintenance/language/messages.inc       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 6311b6142a..4a21b5625a 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -338,7 +338,7 @@ class CoreParserFunctions {
 			return '';
 		else
 			return( '<span class="error">' .
-				wfMsgForContent( 'duplicate_defaultsort',
+				wfMsg( 'duplicate-defaultsort',
 						 htmlspecialchars( $old ),
 						 htmlspecialchars( $text ) ) .
 				'</span>' );
@@ -376,7 +376,7 @@ class CoreParserFunctions {
 		$stripList = $parser->getStripList();
 		if ( !in_array( $tagName, $stripList ) ) {
 			return '<span class="error">' .
-				wfMsgForContent( 'unknown_extension_tag', $tagName ) .
+				wfMsg( 'unknown_extension_tag', $tagName ) .
 				'</span>';
 		}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 56e63eb574..d9175fc40a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3661,7 +3661,7 @@ You can also [[Special:Watchlist/edit|use the standard editor]].',
 
 # Core parser functions
 'unknown_extension_tag' => 'Unknown extension tag "$1"',
-'duplicate_defaultsort' => 'Warning: Default sort key "$2" overrides earlier default sort key "$1".',
+'duplicate-defaultsort' => 'Warning: Default sort key "$2" overrides earlier default sort key "$1".',
 
 # Special:Version
 'version'                          => 'Version', # Not used as normal message but as header for the special page itself
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index e09668f52a..7aff2924a9 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -3075,7 +3075,7 @@ $1
 
 # Core parser functions
 'unknown_extension_tag' => 'תגית בלתי ידועה: "$1"',
-'duplicate_defaultsort' => 'אזהרה: המיון הרגיל "$2" דורס את המיון הרגיל המוקדם ממנו "$1".',
+'duplicate-defaultsort' => 'אזהרה: המיון הרגיל "$2" דורס את המיון הרגיל המוקדם ממנו "$1".',
 
 # Special:Version
 'version'                          => 'גרסת התוכנה', # Not used as normal message but as header for the special page itself
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index aee7c1e020..ce668c8374 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2761,7 +2761,7 @@ $wgMessageStructure = array(
 	),
 	'CoreParserFunctions' => array(
 		'unknown_extension_tag',
-		'duplicate_defaultsort',
+		'duplicate-defaultsort',
 	),
 	'version' => array(
 		'version',
-- 
2.20.1