X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Funblock.php;h=82d0d32c109149f3e732754c3bfffb61fd9e0121;hb=d4be5349b30f49fa049dbfc854bb2a95eeb1d5c1;hp=0f63e1dae05802c4308f52e7f644d63fb81cbec1;hpb=2ae04bb6d598c74763aca79ab52172934158be46;p=quix0rs-gnu-social.git diff --git a/actions/unblock.php b/actions/unblock.php index 0f63e1dae0..82d0d32c10 100644 --- a/actions/unblock.php +++ b/actions/unblock.php @@ -42,7 +42,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class UnblockAction extends ProfileFormAction { function prepare($args) @@ -56,8 +55,8 @@ class UnblockAction extends ProfileFormAction assert(!empty($cur)); // checked by parent if (!$cur->hasBlocked($this->profile)) { + // TRANS: Client error displayed when trying to unblock a non-blocked user. $this->clientError(_("You haven't blocked that user.")); - return false; } return true; @@ -68,7 +67,6 @@ class UnblockAction extends ProfileFormAction * * @return void */ - function handlePost() { $cur = common_current_user(); @@ -83,8 +81,8 @@ class UnblockAction extends ProfileFormAction } if (!$result) { + // TRANS: Server error displayed when removing a user block. $this->serverError(_('Error removing the block.')); - return; } } }