From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Wed, 30 Jun 2010 23:08:31 +0000 (+0000)
Subject: When using escapenoentities, decode entities
X-Git-Tag: 1.31.0-rc.0~36326
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=c63921388f656c9152cee2c643e940af912339bb;p=lhc%2Fweb%2Fwiklou.git

When using escapenoentities, decode entities

See r67090 for context.  Maybe it would be better to alter
normalizeCharReferences() instead?  I'm not sure where else it's called.
---

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 2a3f8473cf..ce508c3c20 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1063,7 +1063,7 @@ class Sanitizer {
 		# hurt.
 		$html = htmlspecialchars( $html, ENT_QUOTES );
 		$html = str_replace( '&amp;', '&', $html );
-		$html = Sanitizer::normalizeCharReferences( $html );
+		$html = Sanitizer::decodeCharReferences( $html );
 		return $html;
 	}