X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsandbox.php;h=9397a093031ee046cfb510b2de372256bcd222c3;hb=8d4cdbb430c46e34cc01cdedbbf44ff160541f2b;hp=5b034ff07819da35c5ce1707318aa3b9687ebb77;hpb=4b98edf75f4e255f8c61087bd1525d89653a521f;p=quix0rs-gnu-social.git diff --git a/actions/sandbox.php b/actions/sandbox.php index 5b034ff078..9397a09303 100644 --- a/actions/sandbox.php +++ b/actions/sandbox.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class SandboxAction extends ProfileFormAction { /** @@ -50,8 +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,15 +60,15 @@ class SandboxAction extends ProfileFormAction assert(!empty($cur)); // checked by parent if (!$cur->hasRight(Right::SANDBOXUSER)) { - $this->clientError(_("You cannot sandbox users on this site.")); - return false; + // 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.')); } assert(!empty($this->profile)); // checked by parent if ($this->profile->isSandboxed()) { - $this->clientError(_("User is already sandboxed.")); - return false; + // TRANS: Client error displayed trying to sandbox an already sandboxed user. + $this->clientError(_('User is already sandboxed.')); } return true; @@ -81,7 +79,6 @@ class SandboxAction extends ProfileFormAction * * @return void */ - function handlePost() { $this->profile->sandbox();