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

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

diff --git a/actions/unsandbox.php b/actions/unsandbox.php
index 98bd2d4f54761f981898dc45f4bfa9ff73d6b57a..5e1110aa87c3de30342fa3c90b98d44384d4bcca 100644 (file)
--- a/actions/unsandbox.php
+++ b/actions/unsandbox.php
@@ -49,7 +49,7 @@ class UnsandboxAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;
@@ -62,7 +62,6 @@ class UnsandboxAction extends ProfileFormAction
         if (!$cur->hasRight(Right::SANDBOXUSER)) {
             // TRANS: Client error on page to unsandbox a user when the feature is not enabled.
             $this->clientError(_('You cannot sandbox users on this site.'));
-            return false;
         }
 
         assert(!empty($this->profile)); // checked by parent
@@ -70,7 +69,6 @@ class UnsandboxAction extends ProfileFormAction
         if (!$this->profile->isSandboxed()) {
             // TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.
             $this->clientError(_('User is not sandboxed.'));
-            return false;
         }
 
         return true;