diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 15:38:10 -0500 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 15:38:10 -0500 |
commit | 02d7167906b63d490db3b5c3848accc5235b220f (patch) | |
tree | 92323dec8d456fdc737ee3a74c48dedf4cb92bcd /actions/tagrss.php | |
parent | d260d841ebae71acf7bf726f52acaa6391ce1824 (diff) | |
parent | 60f737dc1eb2f126bae28ce095bc2d17a22bd7d9 (diff) |
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'actions/tagrss.php')
-rw-r--r-- | actions/tagrss.php | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/actions/tagrss.php b/actions/tagrss.php index b4c2dcdff..a77fa12c9 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -25,12 +25,12 @@ require_once(INSTALLDIR.'/lib/rssaction.php'); class TagrssAction extends Rss10Action { + var $tag; - function init() - { - $tag = $this->trimmed('tag'); + function prepare($args) { + parent::prepare($args); + $tag = common_canonical_tag($this->trimmed('tag')); $this->tag = Notice_tag::staticGet('tag', $tag); - if (!$this->tag) { $this->clientError(_('No such tag.')); return false; @@ -39,7 +39,7 @@ class TagrssAction extends Rss10Action } } - function get_notices($limit=0) + function getNotices($limit=0) { $tag = $this->tag; @@ -48,7 +48,6 @@ class TagrssAction extends Rss10Action } $notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit); - while ($notice->fetch()) { $notices[] = clone($notice); } @@ -56,10 +55,9 @@ class TagrssAction extends Rss10Action return $notices; } - function get_channel() + function getChannel() { - $tag = $this->tag->tag; - + $tagname = $this->tag->tag; $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)), 'title' => $tagname, 'link' => common_local_url('tagrss', array('tag' => $tagname)), |