X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fuserrss.php;h=308db948918c079a9d4a1ce63463840c3b564a82;hb=0a20abf1d8a9a068df9310d6903cc303f39b25ed;hp=99330af57f7edf9e3b260f58ba23b8b3f6e640b8;hpb=eb6b4628b95f1bb770b01df86eacab756f28364b;p=quix0rs-gnu-social.git

diff --git a/actions/userrss.php b/actions/userrss.php
index 99330af57f..308db94891 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -31,21 +31,21 @@ class UserrssAction extends Rss10Action
     {
         parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
         $this->tag  = $this->trimmed('tag');
 
         if (!$this->user) {
             // TRANS: Client error displayed when user not found for an action.
             $this->clientError(_('No such user.'));
-            return false;
+        }
+
+        if (!empty($this->tag)) {
+            $this->notices = $this->getTaggedNotices();
         } else {
-            if (!empty($this->tag)) {
-                $this->notices = $this->getTaggedNotices();
-            } else {
-                $this->notices = $this->getNotices();
-            }
-            return true;
+            $this->notices = $this->getNotices();
         }
+
+        return true;
     }
 
     function getTaggedNotices()
@@ -100,16 +100,8 @@ class UserrssAction extends Rss10Action
 
     function getImage()
     {
-        $user = $this->user;
-        $profile = $user->getProfile();
-        if (!$profile) {
-            common_log_db_error($user, 'SELECT', __FILE__);
-            // TRANS: Error message displayed when referring to a user without a profile.
-            $this->serverError(_('User has no profile.'));
-            return null;
-        }
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        return ($avatar) ? $avatar->url : null;
+        $profile = $this->user->getProfile();
+        return $profile->avatarUrl(AVATAR_PROFILE_SIZE);
     }
 
     // override parent to add X-SUP-ID URL