GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix database fetch and bad var name in tagrss

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-10 15:05:16 -05:00
parent a3b72d9e3b
commit 44ec22c0f2
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
actions/tagrss.php
View File

@ -33,24 +33,14 @@ class TagrssAction extends Rss10Action {
return false; return false;
} }
$this->tag = Notice_tag::staticGet('tag', $tag); $this->tag = $tag;
if (!$this->tag) {
common_user_error(_('No such tag.'));
return false;
} else {
return true; return true;
} }
}
function get_notices($limit=0) { function get_notices($limit=0) {
$tag = $this->tag; $tag = $this->tag;
if (is_null($tag)) { $notice = Notice_tag::getStream($tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
return NULL;
}
$notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
while ($notice->fetch()) { while ($notice->fetch()) {
$notices[] = clone($notice); $notices[] = clone($notice);
@ -60,12 +50,12 @@ class TagrssAction extends Rss10Action {
} }
function get_channel() { function get_channel() {
$tag = $this->tag->tag; $tag = $this->tag;
$c = array('url' => common_local_url('tagrss', array('tag' => $tagname)), $c = array('url' => common_local_url('tagrss', array('tag' => $tag)),
'title' => $tagname, 'title' => $tag,
'link' => common_local_url('tagrss', array('tag' => $tagname)), 'link' => common_local_url('tagrss', array('tag' => $tag)),
'description' => sprintf(_('Microblog tagged with %s'), $tagname)); 'description' => sprintf(_('Microblog tagged with %s'), $tag));
return $c; return $c;
} }
} }