From 4620cb1ae9de27fad3c99db9fcee0bca6629018d Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 17 Nov 2006 13:27:56 +0000
Subject: [PATCH] Restore previous parser test with comment in response to
 brion on Wikitech-l.  And note to self: URLENCODING URLS IS VERY VERY BAD. 
 Even when you're tired.

---
 includes/Skin.php           |  4 ++--
 maintenance/parserTests.txt | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index 8d528678ac..da0f507ccc 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -327,9 +327,9 @@ class Skin extends Linker {
 		global $wgUseSiteJs;
 		if ($wgUseSiteJs) {
 			if ($wgUser->isLoggedIn()) {
-				$r .= "<script type=\"$wgJsMimeType\" src=\"".urlencode(self::makeUrl('-','action=raw&smaxage=0&gen=js'))."\"><!-- site js --></script>\n";
+				$r .= "<script type=\"$wgJsMimeType\" src=\"".htmlspecialchars(self::makeUrl('-','action=raw&smaxage=0&gen=js'))."\"><!-- site js --></script>\n";
 			} else {
-				$r .= "<script type=\"$wgJsMimeType\" src=\"".urlencode(self::makeUrl('-','action=raw&gen=js'))."\"><!-- site js --></script>\n";
+				$r .= "<script type=\"$wgJsMimeType\" src=\"".htmlspecialchars(self::makeUrl('-','action=raw&gen=js'))."\"><!-- site js --></script>\n";
 			}
 		}
 		if( $wgAllowUserJs && $wgUser->isLoggedIn() ) {
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 1579c2257f..26a12e15fa 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -5995,6 +5995,16 @@ RAW magic word
 </p>
 !! end
 
+# This isn't needed for XHTML conformance, but would be handy as a fallback security measure
+!! test
+TODO: Always escape literal '>' in output, not just after '<'
+!! input
+><>
+!! result
+<p>&gt;&lt;&gt;
+</p>
+!! end
+
 !! test
 Template caching
 !! input
-- 
2.20.1