From 43cc64eaa46460ae79bfd67e8a63e049a898ee16 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 5 Dec 2005 08:19:52 +0000
Subject: [PATCH] * (bug 4170) Decode HTML character escapes in sort key

---
 RELEASE-NOTES             | 1 +
 includes/CategoryPage.php | 8 ++++----
 includes/Parser.php       | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 98a77fb777..2dac2a04be 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -298,6 +298,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 1850) Additional fixes so existing local and remote images
   get a blue link even if there's no local description page
 * (bug 4169) Use $wgLegalTitleChars in pipe trick conversions
+* (bug 4170) Decode HTML character escapes in sort key
 
 
 === Caveats ===
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index e5c11e822c..d79a463fb2 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -258,8 +258,8 @@ class CategoryPage extends Article {
 					}
 					$cont_msg = "";
 					if ( $articles_start_char[$index] == $prev_start_char )
-						$cont_msg = wfMsg('listingcontinuesabbrev');
-					$r .= "<h3>{$articles_start_char[$index]}$cont_msg</h3>\n<ul>";
+						$cont_msg = wfMsgHtml('listingcontinuesabbrev');
+					$r .= "<h3>" . htmlspecialchars( $articles_start_char[$index] ) . "$cont_msg</h3>\n<ul>";
 					$prev_start_char = $articles_start_char[$index];
 				}
 
@@ -284,13 +284,13 @@ class CategoryPage extends Article {
 	 * @access private
 	 */
 	function shortList( $articles, $articles_start_char ) {
-		$r = '<h3>'.$articles_start_char[0]."</h3>\n";
+		$r = '<h3>' . htmlspecialchars( $articles_start_char[0] ) . "</h3>\n";
 		$r .= '<ul><li>'.$articles[0].'</li>';
 		for ($index = 1; $index < count($articles); $index++ )
 		{
 			if ($articles_start_char[$index] != $articles_start_char[$index - 1])
 			{
-				$r .= "</ul><h3>{$articles_start_char[$index]}</h3>\n<ul>";
+				$r .= "</ul><h3>" . htmlspecialchars( $articles_start_char[$index] ) . "</h3>\n<ul>";
 			}
 
 			$r .= "<li>{$articles[$index]}</li>";
diff --git a/includes/Parser.php b/includes/Parser.php
index 0807bd2a09..55d7c3cb6f 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1434,6 +1434,7 @@ class Parser
 					} else {
 						$sortkey = $text;
 					}
+					$sortkey = Sanitizer::decodeCharReferences( $sortkey );
 					$sortkey = $wgContLang->convertCategoryKey( $sortkey );
 					$wgLinkCache->addCategoryLinkObj( $nt, $sortkey );
 					$this->mOutput->addCategoryLink( $t );
-- 
2.20.1