X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpeopletagsbyuser.php;h=9a5f9106f41086885f271459874b0448632b3af8;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=dc3e50b9f2075b9f193a6878c45a51bc0cfd10d2;hpb=5115aa3e4c7bf39fc9c683cb55042827a5cc1783;p=quix0rs-gnu-social.git diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php index dc3e50b9f2..9a5f9106f4 100644 --- a/actions/peopletagsbyuser.php +++ b/actions/peopletagsbyuser.php @@ -39,7 +39,7 @@ class PeopletagsbyuserAction extends Action var $tagger = null; var $tags = null; - function isReadOnly($args) + function isReadOnly(array $args=array()) { return true; } @@ -68,7 +68,7 @@ class PeopletagsbyuserAction extends Action } } - function prepare($args) + function prepare(array $args=array()) { parent::prepare($args); @@ -76,7 +76,12 @@ class PeopletagsbyuserAction extends Action $this->args['public'] = $this->args['private'] = false; } - $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 @@ -87,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(); @@ -103,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; @@ -133,16 +135,15 @@ class PeopletagsbyuserAction extends Action return true; } - function handle($args) + function handle(array $args=array()) { parent::handle($args); - # Post from the tag dropdown; redirect to a GET + // Post from the tag dropdown; redirect to a GET - if ($_SERVER['REQUEST_METHOD'] == 'POST') { - common_redirect(common_local_url('peopletagsbyuser', $this->getSelfUrlArgs()), 303); - return; - } + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + common_redirect(common_local_url('peopletagsbyuser', $this->getSelfUrlArgs()), 303); + } $this->showPage(); }