X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Funsandbox.php;h=5e1110aa87c3de30342fa3c90b98d44384d4bcca;hb=b53e1439969bfa2c0b551d8cc2fc8fe15652c62a;hp=22f4d8e766e7f35f0802b3d61af02ad43016bac2;hpb=a42e128c1532c45fd930d98c985f9a8d98ff6868;p=quix0rs-gnu-social.git diff --git a/actions/unsandbox.php b/actions/unsandbox.php index 22f4d8e766..5e1110aa87 100644 --- a/actions/unsandbox.php +++ b/actions/unsandbox.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class UnsandboxAction extends ProfileFormAction { /** @@ -50,8 +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,15 +60,15 @@ class UnsandboxAction 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 on page to unsandbox a user when 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 not sandboxed.")); - return false; + // 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 true; @@ -81,7 +79,6 @@ class UnsandboxAction extends ProfileFormAction * * @return void */ - function handlePost() { $this->profile->unsandbox();