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 c44aa3a6d788a1764cd33a9ac1d3730f0c93ee29..ac25a0d18440153db23c6d7efc35ca9f63ffaf05 100644 (file)
--- a/actions/silence.php
+++ b/actions/silence.php
@@ -49,7 +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,7 +62,6 @@ class SilenceAction extends ProfileFormAction
         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
@@ -70,7 +69,6 @@ class SilenceAction extends ProfileFormAction
         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;