From: Brian Wolff <bawolff@users.mediawiki.org>
Date: Wed, 7 Sep 2011 19:14:06 +0000 (+0000)
Subject: $wgOverrideSiteFeed was double escaping urls (noticed in bug 30621).
X-Git-Tag: 1.31.0-rc.0~27823
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=40ca6f8308d7464295110b3d9ab43254147a91d0;p=lhc%2Fweb%2Fwiklou.git

$wgOverrideSiteFeed was double escaping urls (noticed in bug 30621).

(aka it was giving things with &amp;amp; in them :s )
---

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 4abe94de56..d0119054d5 100644
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -443,6 +443,7 @@ production.
 * (bug 30074) Moving user JS subpages resulted in JS errors because
   #REDIRECT [[Foo]] is invalid JS
 * Tracking categories are no longer shown in footer for special pages
+* $wgOverrideSiteFeed no longer double escapes urls.
 
 === API changes in 1.18 ===
 * BREAKING CHANGE: action=watch now requires POST and token.
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 5b0070c925..7b68ecfa8b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2885,9 +2885,10 @@ $distantTemplates
 
 			if ( $wgOverrideSiteFeed ) {
 				foreach ( $wgOverrideSiteFeed as $type => $feedUrl ) {
+					// Note, this->feedLink escapes the url.
 					$tags[] = $this->feedLink(
 						$type,
-						htmlspecialchars( $feedUrl ),
+						$feedUrl,
 						wfMsg( "site-{$type}-feed", $wgSitename )
 					);
 				}