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

diff --git a/actions/userrss.php b/actions/userrss.php
index b60cc5e0c7..308db94891 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -29,25 +29,23 @@ class UserrssAction extends Rss10Action
 
     function prepare($args)
     {
-        common_debug("UserrssAction");
-
         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()
@@ -102,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: Server error displayed in user RSS when user does not have a matching profile.
-            $this->serverError(_('User without matching 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