From: X! <soxred93@users.mediawiki.org>
Date: Tue, 16 Sep 2008 03:58:18 +0000 (+0000)
Subject: (bug 15617)
X-Git-Tag: 1.31.0-rc.0~45278
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=4b2495dda342cbba9e21aad6fd4a58a8082d55e2;p=lhc%2Fweb%2Fwiklou.git

(bug 15617)
$wgFeedClassesOutputPage::getHeadLinks() respects $wgFeedClasses, instead of hardcoding rss and atom.
Patch by Juliano F. Ravasi.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b119e13639..d4107053b4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -206,6 +206,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   even if there are broken link records with source article id 0 in the database
 * (bug 15598) Special:Newpages default limit uses user preference for recentchanges
   limit instead of hardcoded 50.
+* (bug 15617) $wgFeedClassesOutputPage::getHeadLinks() respects $wgFeedClasses, instead of hardcoding rss and atom. Patch by Juliano F. Ravasi. 
 
 === API changes in 1.14 ===
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 17a774d50d..e571c8ed54 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1533,7 +1533,7 @@ class OutputPage {
 			# or "Breaking news" one). For this, we see if $wgOverrideSiteFeed is defined.
 			# If so, use it instead.
 			
-			global $wgOverrideSiteFeed, $wgSitename;
+			global $wgOverrideSiteFeed, $wgSitename, $wgFeedClasses;
 			$rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
 			
 			if ( $wgOverrideSiteFeed ) {
@@ -1545,14 +1545,12 @@ class OutputPage {
 				}
 			}
 			else if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) {
-				$tags[] = $this->feedLink(
-					'rss',
-					$rctitle->getFullURL( 'feed=rss' ),
-					wfMsg( 'site-rss-feed', $wgSitename ) );
-				$tags[] = $this->feedLink(
-					'atom',
-					$rctitle->getFullURL( 'feed=atom' ),
-					wfMsg( 'site-atom-feed', $wgSitename ) );
+				foreach( $wgFeedClasses as $format => $class ) {
+					$tags[] = $this->feedLink(
+						$format,
+						$rctitle->getFullURL( "feed={$format}" ),
+						wfMsg( "site-{$format}-feed", $wgSitename ) ); # For grep: 'site-rss-feed', 'site-atom-feed'.
+				}
 			}
 		}