Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / actions / repliesrss.php

diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 0c71130718ac6205237eef3d72238d4aaee2b34d..145b51aaea99dfc58cb252c7c1210897dd773a39 100644 (file)
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -36,7 +36,6 @@ class RepliesrssAction extends Rss10Action
         if (!$this->user) {
             // TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
             $this->clientError(_('No such user.'));
-            return false;
         } else {
             $this->notices = $this->getNotices($this->limit);
             return true;
@@ -78,13 +77,8 @@ class RepliesrssAction extends Rss10Action
 
     function getImage()
     {
-        $user = $this->user;
-        $profile = $user->getProfile();
-        if (!$profile) {
-            return null;
-        }
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        return ($avatar) ? $avatar->url : null;
+        $profile = $this->user->getProfile();
+        return $profile->avatarUrl(AVATAR_PROFILE_SIZE);
     }
 
     function isReadOnly($args)