diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-01 13:04:23 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-01 13:04:23 -0500 |
| commit | 5f5413624d166a9b2116d266c7698dd6dcd2d8c4 (patch) | |
| tree | 3f7f85bbfb747d68bf518df026eea6ac686ad0c0 /actions/showfavorites.php | |
| parent | 658683e240ef6e44c6450a16448fe7cb82f792f2 (diff) | |
| parent | 44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (diff) | |
Merge branch '0.9.x' into userflag
Diffstat (limited to 'actions/showfavorites.php')
| -rw-r--r-- | actions/showfavorites.php | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/actions/showfavorites.php b/actions/showfavorites.php index b96d2af37..b12fcdd9a 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -164,13 +164,25 @@ class ShowfavoritesAction extends OwnerDesignAction function getFeeds() { - $feedurl = common_local_url('favoritesrss', - array('nickname' => - $this->user->nickname)); - $feedtitle = sprintf(_('Feed for favorites of %s'), - $this->user->nickname); - - return array(new Feed(Feed::RSS1, $feedurl, $feedtitle)); + return array(new Feed(Feed::RSS1, + common_local_url('favoritesrss', + array('nickname' => $this->user->nickname)), + sprintf(_('Feed for favorites of %s (RSS 1.0)'), + $this->user->nickname)), + new Feed(Feed::RSS2, + common_local_url('ApiTimelineFavorites', + array( + 'id' => $this->user->nickname, + 'format' => 'rss')), + sprintf(_('Feed for favorites of %s (RSS 2.0)'), + $this->user->nickname)), + new Feed(Feed::ATOM, + common_local_url('ApiTimelineFavorites', + array( + 'id' => $this->user->nickname, + 'format' => 'atom')), + sprintf(_('Feed for favorites of %s (Atom)'), + $this->user->nickname))); } /** |