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

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

diff --git a/actions/silence.php b/actions/silence.php
index 09cc480d9ebbcb274dfe741ae822a84caabb8cf4..ac25a0d18440153db23c6d7efc35ca9f63ffaf05 100644 (file)
--- a/actions/silence.php
+++ b/actions/silence.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class SilenceAction extends ProfileFormAction
 {
     /**
@@ -50,8 +49,7 @@ class SilenceAction 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 SilenceAction extends ProfileFormAction
         assert(!empty($cur)); // checked by parent
 
         if (!$cur->hasRight(Right::SILENCEUSER)) {
+            // TRANS: Client error displayed trying to silence a user on a site where the feature is not enabled.
             $this->clientError(_('You cannot silence users on this site.'));
-            return false;
         }
 
         assert(!empty($this->profile)); // checked by parent
 
         if ($this->profile->isSilenced()) {
+            // TRANS: Client error displayed trying to silence an already silenced user.
             $this->clientError(_('User is already silenced.'));
-            return false;
         }
 
         return true;
@@ -81,7 +79,6 @@ class SilenceAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handlePost()
     {
         $this->profile->silence();