summaryrefslogtreecommitdiff
path: root/actions/replies.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-31 14:47:21 -0400
committerEvan Prodromou <evan@status.net>2009-10-31 14:47:21 -0400
commit44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (patch)
treeeacb1d8470354e7f7d55b0ca185690acf45cecd7 /actions/replies.php
parentbed942271d772e6eed36c4c012c48460510564f1 (diff)
parent8a333805df5fc3786ef8abe1d71421fb9270ff7f (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/replies.php')
-rw-r--r--actions/replies.php24
1 files changed, 19 insertions, 5 deletions
diff --git a/actions/replies.php b/actions/replies.php
index 6003ad30b..a13b5a227 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -138,11 +138,25 @@ class RepliesAction extends OwnerDesignAction
function getFeeds()
{
- $rssurl = common_local_url('repliesrss',
- array('nickname' => $this->user->nickname));
- $rsstitle = sprintf(_('Feed for replies to %s'), $this->user->nickname);
-
- return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
+ return array(new Feed(Feed::RSS1,
+ common_local_url('repliesrss',
+ array('nickname' => $this->user->nickname)),
+ sprintf(_('Replies feed for %s (RSS 1.0)'),
+ $this->user->nickname)),
+ new Feed(Feed::RSS2,
+ common_local_url('ApiTimelineMentions',
+ array(
+ 'id' => $this->user->nickname,
+ 'format' => 'rss')),
+ sprintf(_('Replies feed for %s (RSS 2.0)'),
+ $this->user->nickname)),
+ new Feed(Feed::ATOM,
+ common_local_url('ApiTimelineMentions',
+ array(
+ 'id' => $this->user->nickname,
+ 'format' => 'atom')),
+ sprintf(_('Replies feed for %s (Atom)'),
+ $this->user->nickname)));
}
/**