Fix database fetch and bad var name in tagrss
This commit is contained in:
parent
a3b72d9e3b
commit
44ec22c0f2
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user