| Index: branches/wmf/1.17wmf1/includes/OutputPage.php |
| — | — | @@ -2669,9 +2669,10 @@ |
| 2670 | 2670 | |
| 2671 | 2671 | if ( $wgOverrideSiteFeed ) { |
| 2672 | 2672 | foreach ( $wgOverrideSiteFeed as $type => $feedUrl ) { |
| | 2673 | + // Note, this->feedLink escapes the url. |
| 2673 | 2674 | $tags[] = $this->feedLink( |
| 2674 | 2675 | $type, |
| 2675 | | - htmlspecialchars( $feedUrl ), |
| | 2676 | + $feedUrl, |
| 2676 | 2677 | wfMsg( "site-{$type}-feed", $wgSitename ) |
| 2677 | 2678 | ); |
| 2678 | 2679 | } |
| Property changes on: branches/wmf/1.17wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2679 | 2680 | Merged /trunk/phase3/includes/OutputPage.php:r96472 |