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

Fix undefined variable error and some other cleanup

Browse Source
This commit is contained in:
Zach Copley 2010-03-05 16:40:35 -08:00
parent 43cc24a0cc
commit f653c3b914
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
actions/userrss.php
View File

@ -29,6 +29,8 @@ class UserrssAction extends Rss10Action
function prepare($args)
{
common_debug("UserrssAction");
parent::prepare($args);
$nickname = $this->trimmed('nickname');
$this->user = User::staticGet('nickname', $nickname);
@ -38,8 +40,8 @@ class UserrssAction extends Rss10Action
$this->clientError(_('No such user.'));
return false;
} else {
if ($this->tag) {
$this->notices = $this->getTaggedNotices($tag, $this->limit);
if (!empty($this->tag)) {
$this->notices = $this->getTaggedNotices($this->tag, $this->limit);
} else {
$this->notices = $this->getNotices($this->limit);
}
@ -47,15 +49,15 @@ class UserrssAction extends Rss10Action
}
}
function getTaggedNotices($tag = null, $limit=0)
function getTaggedNotices()
{
$user = $this->user;
if (is_null($user)) {
return null;
}
$notice = $user->getTaggedNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit, 0, 0, null, $tag);
$notice = $this->user->getTaggedNotices(
$this->tag,
0,
($this->limit == 0) ? NOTICES_PER_PAGE : $this->limit,
0,
0
);
$notices = array();
while ($notice->fetch()) {
@ -66,15 +68,12 @@ class UserrssAction extends Rss10Action
}
function getNotices($limit=0)
function getNotices()
{
$user = $this->user;
if (is_null($user)) {
return null;
}
$notice = $user->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
$notice = $this->user->getNotices(
0,
($limit == 0) ? NOTICES_PER_PAGE : $limit
);
$notices = array();
while ($notice->fetch()) {