| Index: trunk/phase3/includes/SpecialRecentchanges.php |
| — | — | @@ -220,8 +220,6 @@ |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | // And now for the content |
| 224 | | - $wgOut->setSyndicated( true ); |
| 225 | | - |
| 226 | 224 | $list = ChangesList::newFromUser( $wgUser ); |
| 227 | 225 | |
| 228 | 226 | if ( $wgAllowCategorizedRecentChanges ) { |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1277,12 +1277,31 @@ |
| 1278 | 1278 | } |
| 1279 | 1279 | $ret .= " />\n"; |
| 1280 | 1280 | } |
| | 1281 | + |
| | 1282 | + # Recent changes feed should appear on every page |
| | 1283 | + global $wgSitename; |
| | 1284 | + $rctitle = SpecialPage::getTitleFor( 'Recentchanges' ); |
| | 1285 | + $link = $rctitle->escapeFullURL( 'feed=rss' ); |
| | 1286 | + $title = wfMsg( 'site-rss-feed', $wgSitename ); |
| | 1287 | + $ret .= "<link rel='alternate' type='application/rss+xml' title='$title' href='$link' />\n"; |
| | 1288 | + $link = $rctitle->escapeFullURL( 'feed=atom' ); |
| | 1289 | + $title = wfMsg( 'site-atom-feed', $wgSitename ); |
| | 1290 | + $ret .= "<link rel='alternate' type='application/atom+xml' title='$title' href='$link' />\n"; |
| | 1291 | + |
| 1281 | 1292 | if( $this->isSyndicated() ) { |
| 1282 | 1293 | # FIXME: centralize the mime-type and name information in Feed.php |
| 1283 | 1294 | $link = $wgRequest->escapeAppendQuery( 'feed=rss' ); |
| 1284 | | - $ret .= "<link rel='alternate' type='application/rss+xml' title='RSS 2.0' href='$link' />\n"; |
| | 1295 | + # Use the page name for the title (accessed through $wgTitle since |
| | 1296 | + # there's no other way). In principle, this could lead to issues |
| | 1297 | + # with having the same name for different feeds corresponding to |
| | 1298 | + # the same page, but we can't avoid that at this low a level. |
| | 1299 | + global $wgTitle; |
| | 1300 | + $pagetitle = $wgTitle->getPrefixedText(); |
| | 1301 | + $title = wfMsg( 'page-rss-feed', $pagetitle ); |
| | 1302 | + $ret .= "<link rel='alternate' type='application/rss+xml' title='$title' href='$link' />\n"; |
| 1285 | 1303 | $link = $wgRequest->escapeAppendQuery( 'feed=atom' ); |
| 1286 | | - $ret .= "<link rel='alternate' type='application/atom+xml' title='Atom 1.0' href='$link' />\n"; |
| | 1304 | + $title = wfMsg( 'page-atom-feed', $pagetitle ); |
| | 1305 | + $ret .= "<link rel='alternate' type='application/atom+xml' title='$title' href='$link' />\n"; |
| 1287 | 1306 | } |
| 1288 | 1307 | |
| 1289 | 1308 | return $ret; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -706,6 +706,10 @@ |
| 707 | 707 | 'restorelink' => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}', |
| 708 | 708 | 'feedlinks' => 'Feed:', |
| 709 | 709 | 'feed-invalid' => 'Invalid subscription feed type.', |
| | 710 | +'site-rss-feed' => '$1 RSS Feed', |
| | 711 | +'site-atom-feed' => '$1 Atom Feed', |
| | 712 | +'page-rss-feed' => '"$1" RSS Feed', |
| | 713 | +'page-atom-feed' => '"$1" Atom Feed', |
| 710 | 714 | 'feed-atom' => 'Atom', # only translate this message to other languages if you have to change it |
| 711 | 715 | 'feed-rss' => 'RSS', # only translate this message to other languages if you have to change it |
| 712 | 716 | 'sitenotice' => '-', # the equivalent to wgSiteNotice; don't translate or duplicate this message to other languages |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -27,6 +27,7 @@ |
| 28 | 28 | * (bug 11136) If using Postgres, search path is explicitly set if wgDBmwschema is |
| 29 | 29 | not set to 'mediawiki', allowing multiple mediawiki instances per user. |
| 30 | 30 | * (bug 11151) Add descriptive <title> to revision history page |
| | 31 | +* (bug 5412) Add feed links for the site to all pages |
| 31 | 32 | |
| 32 | 33 | === Bug fixes in 1.12 === |
| 33 | 34 | |