From d0d3d059b56ba24d0d0c6b8ee81ff086691ed5a3 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Sun, 30 May 2010 17:33:59 +0000
Subject: [PATCH] Remove most named character references from output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Recommit of r66254 to trunk.  This was just

find extensions phase3 -iname '*.php' \! -iname '*.i18n.php' \! -iname 'Messages*.php' \! -iname '*_Messages.php' -exec sed -i 's/&nbsp;/\&#160;/g;s/&mdash;/―/g;s/&bull;/•/g;s/&aacute;/á/g;s/&acute;/´/g;s/&agrave;/à/g;s/&alpha;/α/g;s/&auml;/ä/g;s/&ccedil;/ç/g;s/&copy;/©/g;s/&darr;/↓/g;s/&deg;/°/g;s/&eacute;/é/g;s/&ecirc;/ê/g;s/&euml;/ë/g;s/&egrave;/è/g;s/&euro;/€/g;s/&harr;//g;s/&hellip;/…/g;s/&iacute;/í/g;s/&igrave;/ì/g;s/&larr;/←/g;s/&ldquo;/“/g;s/&middot;/·/g;s/&minus;/−/g;s/&ndash;/–/g;s/&oacute;/ó/g;s/&ocirc;/ô/g;s/&oelig;/œ/g;s/&ograve;/ò/g;s/&otilde;/õ/g;s/&ouml;/ö/g;s/&pound;/£/g;s/&prime;/′/g;s/&Prime;/″/g;s/&raquo;/»/g;s/&rarr;/→/g;s/&rdquo;/”/g;s/&Sigma;/Σ/g;s/&times;/×/g;s/&uacute;/ú/g;s/&uarr;/↑/g;s/&uuml;/ü/g;s/&yen;/¥/g' {} +

followed by reading over every single line of the resulting diff and
fixing a whole bunch of false positives.  The reason for this change is
given in <http://lists.wikimedia.org/pipermail/wikitech-l/2010-April/047617.html>.
I cleared it with Tim and Brion on IRC before committing.  It might
cause a few problems, but I tried to be careful; please report any
issues.

I skipped all messages files.  I plan to make a follow-up commit that
alters wfMsgExt() with 'escapenoentities' to sanitize all the entities.
That way, the only messages that will be problems will be ones that
output raw HTML, and we want to get rid of those anyway.

This should get rid of all named entities everywhere except messages.  I
skipped a few things like &nbsp that I noticed in manual inspection,
because they weren't well-formed XML anyway.

Also, to everyone who uses non-breaking spaces when they could use a
normal space, or nothing at all, or CSS padding: I still hate you.  Die.
---
 Gadgets.php        | 4 ++--
 SpecialGadgets.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gadgets.php b/Gadgets.php
index 605b0aa8..c6df7434 100644
--- a/Gadgets.php
+++ b/Gadgets.php
@@ -136,7 +136,7 @@ function wfGadgetsGetPreferences( $user, &$preferences ) {
 	$preferences['gadgets-intro'] =
 		array(
 			'type' => 'info',
-			'label' => '&nbsp;',
+			'label' => '&#160;',
 			'default' => Xml::tags( 'tr', array(),
 				Xml::tags( 'td', array( 'colspan' => 2 ),
 					wfMsgExt( 'gadgets-prefstext', 'parse' ) ) ),
@@ -150,7 +150,7 @@ function wfGadgetsGetPreferences( $user, &$preferences ) {
 			'type' => 'multiselect',
 			'options' => $options,
 			'section' => 'gadgets',
-			'label' => '&nbsp;',
+			'label' => '&#160;',
 			'prefix' => 'gadget-',
 		);
 		
diff --git a/SpecialGadgets.php b/SpecialGadgets.php
index 725592bc..6fb20e17 100644
--- a/SpecialGadgets.php
+++ b/SpecialGadgets.php
@@ -59,7 +59,7 @@ class SpecialGadgets extends SpecialPage {
 					$lnkTarget = $t
 						? $skin->link( $t, wfMsgHTML( 'edit' ), array(), array( 'action' => 'edit' ) ) 
 						: htmlspecialchars( $section );
-					$lnk =  "&nbsp; &nbsp; [$lnkTarget]";
+					$lnk =  "&#160; &#160; [$lnkTarget]";
 				} else {
 					$lnk = '';
 				}
@@ -78,7 +78,7 @@ class SpecialGadgets extends SpecialPage {
 
 				if ( $editInterfaceAllowed ) {
 					$lnkTarget = $skin->link( $t, wfMsgHTML( 'edit' ), array(), array( 'action' => 'edit' ) );
-					$lnk =  "&nbsp; &nbsp; [$lnkTarget]";
+					$lnk =  "&#160; &#160; [$lnkTarget]";
 				} else {
 					$lnk = '';
 				}