Merged

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

diff --git a/actions/unblock.php b/actions/unblock.php
index 1f4d9606b85a7da875dc6ccf030feab2bc72c1ca..cb03214a9f02db44144b720e0c86da2275ed62b4 100644 (file)
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class UnblockAction extends ProfileFormAction
 {
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;
@@ -57,7 +57,6 @@ class UnblockAction extends ProfileFormAction
         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;
@@ -84,7 +83,6 @@ class UnblockAction extends ProfileFormAction
         if (!$result) {
             // TRANS: Server error displayed when removing a user block.
             $this->serverError(_('Error removing the block.'));
-            return;
         }
     }
 }