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

Merge branch 'master' of ../trunk

This commit is contained in:
sarven 2009-01-23 04:08:31 +00:00
parent fbe6aa703e 3f328256bd
commit 651a7dc324
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/allrss.php
View File

@ -49,7 +49,6 @@ require_once INSTALLDIR.'/lib/rssaction.php';
*/
class AllrssAction extends Rss10Action
{
var $user = null;
/**
@ -57,8 +56,9 @@ class AllrssAction extends Rss10Action
*
* @return boolean false if user doesn't exist
*/
function init()
function prepare($args)
{
parent::prepare($args);
$nickname = $this->trimmed('nickname');
$this->user = User::staticGet('nickname', $nickname);

11
actions/repliesrss.php
View File

@ -28,8 +28,9 @@ class RepliesrssAction extends Rss10Action
var $user = null;
function init()
function prepare($args)
{
parent::prepare($args);
$nickname = $this->trimmed('nickname');
$this->user = User::staticGet('nickname', $nickname);
@ -41,7 +42,7 @@ class RepliesrssAction extends Rss10Action
}
}
function get_notices($limit=0)
function getNotices($limit=0)
{
$user = $this->user;
@ -57,7 +58,7 @@ class RepliesrssAction extends Rss10Action
return $notices;
}
function get_channel()
function getChannel()
{
$user = $this->user;
$c = array('url' => common_local_url('repliesrss',
@ -71,7 +72,7 @@ class RepliesrssAction extends Rss10Action
return $c;
}
function get_image()
function getImage()
{
$user = $this->user;
$profile = $user->getProfile();
@ -81,4 +82,4 @@ class RepliesrssAction extends Rss10Action
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
return ($avatar) ? $avatar->url : null;
}
}
}