diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-02-11 16:53:01 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-02-11 16:53:01 +0000 |
| commit | 012288bdf6f4ad41c861504c05b2ac1cee834dd3 (patch) | |
| tree | 39482829b98bcf1ac9e6e8b1ce74d8c80afc5a25 /actions/showfavorites.php | |
| parent | fc293545be13473d992b512141be233c2963f6da (diff) | |
| parent | 22b10399aaa97061ed940f92f5b15f6aacfb1093 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions/showfavorites.php')
| -rw-r--r-- | actions/showfavorites.php | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 31479e1a7..d1c9283f0 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -113,7 +113,7 @@ class ShowfavoritesAction extends Action } common_set_returnto($this->selfUrl()); - + return true; } @@ -136,10 +136,10 @@ class ShowfavoritesAction extends Action /** * Feeds for the <head> section * - * @return void + * @return array Feed objects to show */ - function showFeeds() + function getFeeds() { $feedurl = common_local_url('favoritesrss', array('nickname' => @@ -147,10 +147,7 @@ class ShowfavoritesAction extends Action $feedtitle = sprintf(_('Feed for favorites of %s'), $this->user->nickname); - $this->element('link', array('rel' => 'alternate', - 'href' => $feedurl, - 'type' => 'application/rss+xml', - 'title' => $feedtitle)); + return array(new Feed(Feed::RSS1, $feedurl, $feedtitle)); } /** @@ -166,28 +163,6 @@ class ShowfavoritesAction extends Action } /** - * Show the replies feed links - * - * @return void - */ - - function showExportData() - { - $feedurl = common_local_url('favoritesrss', - array('nickname' => - $this->user->nickname)); - - $fl = new FeedList($this); - - // XXX: I18N - - $fl->show(array(0=>array('href'=> $feedurl, - 'type' => 'rss', - 'version' => 'RSS 1.0', - 'item' => 'Favorites'))); - } - - /** * Show the content * * A list of notices that this user has marked as a favorite |