Merge branch 'link-atom-fix' into 'nightly'

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

diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 321dbe19a1c66cda342e0ea4401848721f860bae..827b284d5c3acf567cf550f5afdae99ed06c721b 100644 (file)
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -58,7 +58,12 @@ class PeopletagsforuserAction 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
@@ -69,15 +74,13 @@ class PeopletagsforuserAction extends Action
                 $args['page'] = $this->arg['page'];
             }
             common_redirect(common_local_url('peopletagsforuser', $args), 301);
-            return false;
         }
 
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
 
         if (!$this->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->tagged = $this->user->getProfile();
@@ -85,7 +88,6 @@ class PeopletagsforuserAction extends Action
         if (!$this->tagged) {
             // 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;