| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1419,12 +1419,12 @@ |
| 1420 | 1420 | } |
| 1421 | 1421 | |
| 1422 | 1422 | if( $wgFeed ) { |
| | 1423 | + global $wgTitle; |
| 1423 | 1424 | foreach( $this->getSyndicationLinks() as $format => $link ) { |
| 1424 | 1425 | # Use the page name for the title (accessed through $wgTitle since |
| 1425 | 1426 | # there's no other way). In principle, this could lead to issues |
| 1426 | 1427 | # with having the same name for different feeds corresponding to |
| 1427 | 1428 | # the same page, but we can't avoid that at this low a level. |
| 1428 | | - global $wgTitle; |
| 1429 | 1429 | |
| 1430 | 1430 | $ret .= $this->feedLink( |
| 1431 | 1431 | $format, |
| — | — | @@ -1432,19 +1432,24 @@ |
| 1433 | 1433 | wfMsg( "page-{$format}-feed", $wgTitle->getPrefixedText() ) ); # Used messages: 'page-rss-feed' and 'page-atom-feed' (for an easier grep) |
| 1434 | 1434 | } |
| 1435 | 1435 | |
| 1436 | | - # Recent changes feed should appear on every page |
| 1437 | | - # Put it after the per-page feed to avoid changing existing behavior. |
| 1438 | | - # It's still available, probably via a menu in your browser. |
| 1439 | | - global $wgSitename; |
| | 1436 | + # Recent changes feed should appear on every page (except recentchanges, |
| | 1437 | + # that would be redundant). Put it after the per-page feed to avoid |
| | 1438 | + # changing existing behavior. It's still available, probably via a |
| | 1439 | + # menu in your browser. |
| | 1440 | + |
| 1440 | 1441 | $rctitle = SpecialPage::getTitleFor( 'Recentchanges' ); |
| 1441 | | - $ret .= $this->feedLink( |
| 1442 | | - 'rss', |
| 1443 | | - $rctitle->getFullURL( 'feed=rss' ), |
| 1444 | | - wfMsg( 'site-rss-feed', $wgSitename ) ); |
| 1445 | | - $ret .= $this->feedLink( |
| 1446 | | - 'atom', |
| 1447 | | - $rctitle->getFullURL( 'feed=atom' ), |
| 1448 | | - wfMsg( 'site-atom-feed', $wgSitename ) ); |
| | 1442 | + if ( $wgTitle->getText() != $rctitle->getText() ) { |
| | 1443 | + global $wgSitename; |
| | 1444 | + |
| | 1445 | + $ret .= $this->feedLink( |
| | 1446 | + 'rss', |
| | 1447 | + $rctitle->getFullURL( 'feed=rss' ), |
| | 1448 | + wfMsg( 'site-rss-feed', $wgSitename ) ); |
| | 1449 | + $ret .= $this->feedLink( |
| | 1450 | + 'atom', |
| | 1451 | + $rctitle->getFullURL( 'feed=atom' ), |
| | 1452 | + wfMsg( 'site-atom-feed', $wgSitename ) ); |
| | 1453 | + } |
| 1449 | 1454 | } |
| 1450 | 1455 | |
| 1451 | 1456 | return $ret; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -364,8 +364,9 @@ |
| 365 | 365 | * (bug 14479) MediaWiki:upload-maxfilesize should have a div id wrapper |
| 366 | 366 | * (bug 14497) Throw visible errors in installer scripts when SQL files |
| 367 | 367 | fail due to database permission or other error |
| | 368 | +* (bug 14500) Site feed (Recentchanges) no longer shows up on the actual |
| | 369 | + recent changes page. |
| 368 | 370 | |
| 369 | | - |
| 370 | 371 | === API changes in 1.13 === |
| 371 | 372 | |
| 372 | 373 | * Fixing main page display in meta=siteinfo |