X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fuserrss.php;h=b7078fcaf886a2967a11cc3d2b058b89cf6f37c2;hb=88e09d45c91b5f59bd5e012ebbef73c635abcb18;hp=6029f443182b6cd8337338460df90499764d1888;hpb=1a03820628d37b9db6e47be22d98789f551f1959;p=quix0rs-gnu-social.git

diff --git a/actions/userrss.php b/actions/userrss.php
index 6029f44318..b7078fcaf8 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -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,24 +40,24 @@ 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();
             } else {
-                $this->notices = $this->getNotices($this->limit);
+                $this->notices = $this->getNotices();
             }
             return true;
         }
     }
 
-    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,
+            ($this->limit == 0) ? NOTICES_PER_PAGE : $this->limit
+        );
 
         $notices = array();
         while ($notice->fetch()) {
@@ -91,8 +90,10 @@ class UserrssAction extends Rss10Action
         $c = array('url' => common_local_url('userrss',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: Message is used as link title. %s is a user nickname.
                    'title' => sprintf(_('%s timeline'), $user->nickname),
                    'link' => $profile->profileurl,
+                   // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
                    'description' => sprintf(_('Updates from %1$s on %2$s!'),
                                             $user->nickname, common_config('site', 'name')));
         return $c;
@@ -104,7 +105,7 @@ class UserrssAction extends Rss10Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->serverError(_('User without matching profile'));
+            $this->serverError(_('User without matching profile.'));
             return null;
         }
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);