summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-02-03 16:31:41 -0800
committerZach Copley <zach@controlyourself.ca>2009-02-03 16:31:41 -0800
commitc16ddd677588424f51d63d37ea9b3eb34c73c233 (patch)
tree750f44271704cd1be9031be796dac3013eda89b1 /actions
parent05e11ea0210fbad502d5fcd5c75ff379fd7824a4 (diff)
trac1095 Profile page had bad alternate links for RSS and Atom feeds
Diffstat (limited to 'actions')
-rw-r--r--actions/showstream.php34
1 files changed, 15 insertions, 19 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index ecd952635..90ffcacf9 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -170,26 +170,22 @@ class ShowstreamAction extends Action
function showFeeds()
{
- // Feeds
$this->element('link', array('rel' => 'alternate',
- 'href' => common_local_url('api',
- array('apiaction' => 'statuses',
- 'method' => 'entity_timeline.rss',
- 'argument' => $this->user->nickname)),
- 'type' => 'application/rss+xml',
- 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
- $this->element('link', array('rel' => 'alternate feed',
- 'href' => common_local_url('api',
- array('apiaction' => 'statuses',
- 'method' => 'entity_timeline.atom',
- 'argument' => $this->user->nickname)),
- 'type' => 'application/atom+xml',
- 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
- $this->element('link', array('rel' => 'alternate',
- 'href' => common_local_url('userrss', array('nickname' =>
- $this->user->nickname)),
- 'type' => 'application/rdf+xml',
- 'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
+ 'type' => 'application/rss+xml',
+ 'href' => common_local_url('userrss',
+ array('nickname' => $this->user->nickname)),
+ 'title' => sprintf(_('Notice feed for %s (RSS)'),
+ $this->user->nickname)));
+
+ $this->element('link',
+ array('rel' => 'alternate',
+ 'href' => common_local_url('api',
+ array('apiaction' => 'statuses',
+ 'method' => 'user_timeline.atom',
+ 'argument' => $this->user->nickname)),
+ 'type' => 'application/atom+xml',
+ 'title' => sprintf(_('Notice feed for %s (Atom)'),
+ $this->user->nickname)));
}
function extraHead()