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

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

diff --git a/actions/sandbox.php b/actions/sandbox.php
index ddbca40b2de6992dac0b86e65a300ddf6adf05f1..9397a093031ee046cfb510b2de372256bcd222c3 100644 (file)
--- a/actions/sandbox.php
+++ b/actions/sandbox.php
@@ -49,7 +49,7 @@ class SandboxAction 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 SandboxAction extends ProfileFormAction
         if (!$cur->hasRight(Right::SANDBOXUSER)) {
             // TRANS: Client error displayed trying to sandbox users on a site where 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 SandboxAction extends ProfileFormAction
         if ($this->profile->isSandboxed()) {
             // TRANS: Client error displayed trying to sandbox an already sandboxed user.
             $this->clientError(_('User is already sandboxed.'));
-            return false;
         }
 
         return true;