Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/unblock.php b/actions/unblock.php
index 0f63e1dae05802c4308f52e7f644d63fb81cbec1..cb03214a9f02db44144b720e0c86da2275ed62b4 100644 (file)
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -42,10 +42,9 @@ 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)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;
@@ -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;
         }
     }
 }