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

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

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 4abe94d..d011905 100644 (file)
--- 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 5b0070c..7b68ecf 100644 (file)
--- 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 )
                                        );
                                }