From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 30 Jan 2005 04:11:22 +0000 (+0000)
Subject: * (bug 1228) Fix double-escaping on &amp; sequences in [enclosed] URLs
X-Git-Tag: 1.5.0alpha1~820
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=07650eba1d0125a615d4d0dd69f171fd416f1d7e;p=lhc%2Fweb%2Fwiklou.git

* (bug 1228) Fix double-escaping on &amp; sequences in [enclosed] URLs
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 1f1701e197..3ed672bbdf 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1015,6 +1015,11 @@ class Parser
 				}
 			}
 
+			# Replace &amp; from obsolete syntax with &.
+			# All HTML entities will be escaped by makeExternalLink()
+			# or maybeMakeImageLink()
+			$url = str_replace( '&amp;', '&', $url );
+
 			# Process the trail (i.e. everything after this link up until start of the next link),
 			# replacing any non-bracketed links
 			$trail = $this->replaceFreeExternalLinks( $trail );
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 79a6afddf5..47656ef6ba 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -480,6 +480,33 @@ Old &amp; use: http://x&y
 </p>
 !! end
 
+!! test
+External links: encoded ampersand
+!! input
+Old &amp; use: http://x&amp;y
+!! result
+<p>Old &amp; use: <a href="http://x&amp;y" class='external free' rel="nofollow">http://x&amp;y</a>
+</p>
+!! end
+
+!! test
+External links: [raw ampersand]
+!! input
+Old &amp; use: [http://x&y]
+!! result
+<p>Old &amp; use: <a href="http://x&amp;y" class='external autonumber' title="http://x&amp;y" rel="nofollow">[1]</a>
+</p>
+!! end
+
+!! test
+External links: [encoded ampersand]
+!! input
+Old &amp; use: [http://x&amp;y]
+!! result
+<p>Old &amp; use: <a href="http://x&amp;y" class='external autonumber' title="http://x&amp;y" rel="nofollow">[1]</a>
+</p>
+!! end
+
 !! test
 External links: www.jpeg.org (bug 554)
 !! input