X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fblock.php;h=018c6782fcbd5f368b1a856dfcde64c62e5e03e8;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=f195fb5a88ffc8663373feccf94898c6811b4253;hpb=7a9777df053a9007b5eaa71f5437584065b615a5;p=quix0rs-gnu-social.git diff --git a/actions/block.php b/actions/block.php index f195fb5a88..018c6782fc 100644 --- a/actions/block.php +++ b/actions/block.php @@ -53,7 +53,7 @@ class BlockAction extends ProfileFormAction * * @return boolean success flag */ - function prepare($args) + function prepare(array $args=array()) { if (!parent::prepare($args)) { return false; @@ -66,7 +66,6 @@ class BlockAction extends ProfileFormAction if ($cur->hasBlocked($this->profile)) { // TRANS: Client error displayed when blocking a user that has already been blocked. $this->clientError(_('You already blocked that user.')); - return false; } return true; @@ -75,13 +74,11 @@ class BlockAction extends ProfileFormAction /** * Handle request * - * Shows a page with list of favorite notices - * * @param array $args $_REQUEST args; handled in prepare() * * @return void */ - function handle($args) + function handle(array $args=array()) { if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { @@ -187,7 +184,6 @@ class BlockAction extends ProfileFormAction if (!$result) { // TRANS: Server error displayed when blocking a user fails. $this->serverError(_('Failed to save block information.')); - return; } } @@ -224,7 +220,8 @@ class BlockAction extends ProfileFormAction function defaultReturnTo() { $user = common_current_user(); - if ($user) { + + if ($user instanceof User) { return common_local_url('subscribers', array('nickname' => $user->nickname)); } else {