Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up r26058, r26059 a bit...

Browse source 
* We've got these nice functions to do escaping of XML for us, use them. :)
* Swapped order so per-page feeds (history, newpages, etc) show up first
I'm still not too thrilled with the message texts on the titles.
This commit is contained in:
Brion Vibber 2007-09-24 18:25:56 +00:00
parent af437d8199
commit 5be2e63423
1 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
includes/OutputPage.php
View file

@ -1278,16 +1278,6 @@ class OutputPage {
$ret .= " />\n";
}
# Recent changes feed should appear on every page
global $wgSitename;
$rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
$link = $rctitle->escapeFullURL( 'feed=rss' );
$title = Sanitizer::encodeAttribute( wfMsg( 'site-rss-feed', $wgSitename ) );
$ret .= "<link rel='alternate' type='application/rss+xml' title='$title' href='$link' />\n";
$link = $rctitle->escapeFullURL( 'feed=atom' );
$title = Sanitizer::encodeAttribute( wfMsg( 'site-atom-feed', $wgSitename ) );
$ret .= "<link rel='alternate' type='application/atom+xml' title='$title' href='$link' />\n";
if( $this->isSyndicated() ) {
# FIXME: centralize the mime-type and name information in Feed.php
# Use the page name for the title (accessed through $wgTitle since
@ -1295,17 +1285,43 @@ class OutputPage {
# with having the same name for different feeds corresponding to
# the same page, but we can't avoid that at this low a level.
global $wgTitle;
$pagetitle = $wgTitle->getPrefixedText();
$link = $wgRequest->escapeAppendQuery( 'feed=rss' );
$title = Sanitizer::encodeAttribute( wfMsg( 'page-rss-feed', $pagetitle ) );
$ret .= "<link rel='alternate' type='application/rss+xml' title='$title' href='$link' />\n";
$link = $wgRequest->escapeAppendQuery( 'feed=atom' );
$title = Sanitizer::encodeAttribute( wfMsg( 'page-atom-feed', $pagetitle ) );
$ret .= "<link rel='alternate' type='application/atom+xml' title='$title' href='$link' />\n";
$ret .= $this->feedLink(
'rss',
$wgRequest->appendQuery( 'feed=rss' ),
wfMsg( 'page-rss-feed', $wgTitle->getPrefixedText() ) );
$ret .= $this->feedLink(
'atom',
$wgRequest->appendQuery( 'feed=atom' ),
wfMsg( 'page-atom-feed', $wgTitle->getPrefixedText() ) );
}
# Recent changes feed should appear on every page
# Put it after the per-page feed to avoid changing existing behavior.
# It's still available, probably via a menu in your browser.
global $wgSitename;
$rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
$ret .= $this->feedLink(
'rss',
$rctitle->getFullURL( 'feed=rss' ),
wfMsg( 'site-rss-feed', $wgSitename ) );
$ret .= $this->feedLink(
'atom',
$rctitle->getFullURL( 'feed=atom' ),
wfMsg( 'site-atom-feed', $wgSitename ) );
return $ret;
}
/**
* Generate a <link rel/> for an RSS feed.
*/
private function feedLink( $type, $url, $text ) {
return Xml::element( 'link', array(
'rel' => 'alternate',
'type' => "application/$type+xml",
'title' => $text,
'href' => $url ) ) . "\n";
}
/**
* Turn off regular page output and return an error reponse