| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1533,7 +1533,7 @@ |
| 1534 | 1534 | # or "Breaking news" one). For this, we see if $wgOverrideSiteFeed is defined. |
| 1535 | 1535 | # If so, use it instead. |
| 1536 | 1536 | |
| 1537 | | - global $wgOverrideSiteFeed, $wgSitename; |
| | 1537 | + global $wgOverrideSiteFeed, $wgSitename, $wgFeedClasses; |
| 1538 | 1538 | $rctitle = SpecialPage::getTitleFor( 'Recentchanges' ); |
| 1539 | 1539 | |
| 1540 | 1540 | if ( $wgOverrideSiteFeed ) { |
| — | — | @@ -1545,14 +1545,12 @@ |
| 1546 | 1546 | } |
| 1547 | 1547 | } |
| 1548 | 1548 | else if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) { |
| 1549 | | - $tags[] = $this->feedLink( |
| 1550 | | - 'rss', |
| 1551 | | - $rctitle->getFullURL( 'feed=rss' ), |
| 1552 | | - wfMsg( 'site-rss-feed', $wgSitename ) ); |
| 1553 | | - $tags[] = $this->feedLink( |
| 1554 | | - 'atom', |
| 1555 | | - $rctitle->getFullURL( 'feed=atom' ), |
| 1556 | | - wfMsg( 'site-atom-feed', $wgSitename ) ); |
| | 1549 | + foreach( $wgFeedClasses as $format => $class ) { |
| | 1550 | + $tags[] = $this->feedLink( |
| | 1551 | + $format, |
| | 1552 | + $rctitle->getFullURL( "feed={$format}" ), |
| | 1553 | + wfMsg( "site-{$format}-feed", $wgSitename ) ); # For grep: 'site-rss-feed', 'site-atom-feed'. |
| | 1554 | + } |
| 1557 | 1555 | } |
| 1558 | 1556 | } |
| 1559 | 1557 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -206,6 +206,7 @@ |
| 207 | 207 | even if there are broken link records with source article id 0 in the database |
| 208 | 208 | * (bug 15598) Special:Newpages default limit uses user preference for recentchanges |
| 209 | 209 | limit instead of hardcoded 50. |
| | 210 | +* (bug 15617) $wgFeedClassesOutputPage::getHeadLinks() respects $wgFeedClasses, instead of hardcoding rss and atom. Patch by Juliano F. Ravasi. |
| 210 | 211 | |
| 211 | 212 | === API changes in 1.14 === |
| 212 | 213 | |