userrss action didn't call parent preparation method

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

diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php
index d857fb235615bc7a32f97bc9b3ac829ef4fb7e69..64edd0929025b6c126955cfb8d22d4810b3c3d3f 100644 (file)
--- a/actions/peopletagsubscriptions.php
+++ b/actions/peopletagsubscriptions.php
@@ -60,7 +60,12 @@ class PeopletagsubscriptionsAction extends Action
     {
         parent::prepare($args);
 
-        $nickname_arg = $this->arg('nickname');
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
+            $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname
@@ -71,15 +76,13 @@ class PeopletagsubscriptionsAction extends Action
                 $args['page'] = $this->arg['page'];
             }
             common_redirect(common_local_url('peopletagsbyuser', $args), 301);
-            return false;
         }
 
-        $user = User::staticGet('nickname', $nickname);
+        $user = User::getKV('nickname', $nickname);
 
         if (!$user) {
             // TRANS: Client error displayed trying to perform an action related to a non-existing user.
             $this->clientError(_('No such user.'), 404);
-            return false;
         }
 
         $this->profile = $user->getProfile();
@@ -87,7 +90,6 @@ class PeopletagsubscriptionsAction extends Action
         if (!$this->profile) {
             // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
-            return false;
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;