summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <git@evanprodromou.name>2009-01-10 15:05:16 -0500
committerEvan Prodromou <git@evanprodromou.name>2009-01-10 15:05:16 -0500
commit44ec22c0f29c7571669a57ecdf6c97132f5f3abd (patch)
tree0e5308d3c520acbc7a4f20accd05d9c7ff76a304 /actions
parenta3b72d9e3be5177936c650603114f364b453318c (diff)
Fix database fetch and bad var name in tagrss
Diffstat (limited to 'actions')
-rw-r--r--actions/tagrss.php26
1 files changed, 8 insertions, 18 deletions
diff --git a/actions/tagrss.php b/actions/tagrss.php
index 8a1461569..737ac113d 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -33,24 +33,14 @@ class TagrssAction extends Rss10Action {
return false;
}
- $this->tag = Notice_tag::staticGet('tag', $tag);
-
- if (!$this->tag) {
- common_user_error(_('No such tag.'));
- return false;
- } else {
- return true;
- }
+ $this->tag = $tag;
+ return true;
}
function get_notices($limit=0) {
$tag = $this->tag;
- if (is_null($tag)) {
- return NULL;
- }
-
- $notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
+ $notice = Notice_tag::getStream($tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
while ($notice->fetch()) {
$notices[] = clone($notice);
@@ -60,12 +50,12 @@ class TagrssAction extends Rss10Action {
}
function get_channel() {
- $tag = $this->tag->tag;
+ $tag = $this->tag;
- $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)),
- 'title' => $tagname,
- 'link' => common_local_url('tagrss', array('tag' => $tagname)),
- 'description' => sprintf(_('Microblog tagged with %s'), $tagname));
+ $c = array('url' => common_local_url('tagrss', array('tag' => $tag)),
+ 'title' => $tag,
+ 'link' => common_local_url('tagrss', array('tag' => $tag)),
+ 'description' => sprintf(_('Microblog tagged with %s'), $tag));
return $c;
}
}