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

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

diff --git a/actions/unsilence.php b/actions/unsilence.php
index 7d282c3661e02deb9f931d6d05fa59d55a19b2fb..cde37201b16f66779c4879789c5e20a27f1e2963 100644 (file)
--- a/actions/unsilence.php
+++ b/actions/unsilence.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class UnsilenceAction extends ProfileFormAction
 {
     /**
@@ -50,8 +49,7 @@ class UnsilenceAction 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 UnsilenceAction extends ProfileFormAction
         assert(!empty($cur)); // checked by parent
 
         if (!$cur->hasRight(Right::SILENCEUSER)) {
+            // TRANS: Client error on page to unsilence a user when 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 on page to unsilence a user when the to be unsilenced user has not been silenced.
             $this->clientError(_('User is not silenced.'));
-            return false;
         }
 
         return true;
@@ -81,7 +79,6 @@ class UnsilenceAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handlePost()
     {
         $this->profile->unsilence();