Avoid having to check for notices without rendered copies in upgrade.php

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

diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php
index 8ef1a56ee15eed415461796751064702e61a761c..4a04ea2fbbf8c0d4e1f703e4d6d29cac96896087 100644 (file)
--- a/actions/peopletagsbyuser.php
+++ b/actions/peopletagsbyuser.php
@@ -92,15 +92,13 @@ class PeopletagsbyuserAction extends Action
                 $args['page'] = $this->arg['page'];
             }
             common_redirect(common_local_url('peopletagsbyuser', $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->tagger = $this->user->getProfile();
@@ -108,7 +106,6 @@ class PeopletagsbyuserAction extends Action
         if (!$this->tagger) {
             // 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;
@@ -119,7 +116,7 @@ class PeopletagsbyuserAction extends Action
 
         $user = common_current_user();
         if ($this->arg('public')) {
-            $this->tags = $this->tagger->getLists(false, $offset, $limit);
+            $this->tags = $this->tagger->getLists(null, $offset, $limit);
         } else if ($this->arg('private')) {
             if (empty($user)) {
                 // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
@@ -133,7 +130,7 @@ class PeopletagsbyuserAction extends Action
                 $this->clientError(_('You cannot view others\' private lists'), 403);
             }
         } else {
-            $this->tags = $this->tagger->getLists(common_current_user(), $offset, $limit);
+            $this->tags = $this->tagger->getLists($this->scoped, $offset, $limit);
         }
         return true;
     }
@@ -146,7 +143,6 @@ class PeopletagsbyuserAction extends Action
 
                if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                    common_redirect(common_local_url('peopletagsbyuser', $this->getSelfUrlArgs()), 303);
-            return;
                }
 
         $this->showPage();