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

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

diff --git a/actions/grantrole.php b/actions/grantrole.php
index 36369a86002f3c89a13ddd1706661d7c6d2839d8..59cb1cdd8eb39d320bc79b1db9e34a72ff3b5f75 100644 (file)
--- a/actions/grantrole.php
+++ b/actions/grantrole.php
@@ -49,7 +49,7 @@ class GrantRoleAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;
@@ -59,12 +59,10 @@ class GrantRoleAction extends ProfileFormAction
         if (!Profile_role::isValid($this->role)) {
             // TRANS: Client error displayed when trying to assign an invalid role to a user.
             $this->clientError(_('Invalid role.'));
-            return false;
         }
         if (!Profile_role::isSettable($this->role)) {
             // TRANS: Client error displayed when trying to assign an reserved role to a user.
             $this->clientError(_('This role is reserved and cannot be set.'));
-            return false;
         }
 
         $cur = common_current_user();
@@ -74,7 +72,6 @@ class GrantRoleAction extends ProfileFormAction
         if (!$cur->hasRight(Right::GRANTROLE)) {
             // TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
             $this->clientError(_('You cannot grant user roles on this site.'));
-            return false;
         }
 
         assert(!empty($this->profile)); // checked by parent
@@ -82,7 +79,6 @@ class GrantRoleAction extends ProfileFormAction
         if ($this->profile->hasRole($this->role)) {
             // TRANS: Client error displayed when trying to assign a role to a user that already has that role.
             $this->clientError(_('User already has this role.'));
-            return false;
         }
 
         return true;