Don't accept non-objects before testing with "instanceof".

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

diff --git a/actions/revokerole.php b/actions/revokerole.php
index 1218c9e923312ab5ab902eb6ef3aa50f99664c99..d3ec2ecdfa1f5f6eda4c09c1d260156e181b4b26 100644 (file)
--- a/actions/revokerole.php
+++ b/actions/revokerole.php
@@ -49,7 +49,7 @@ class RevokeRoleAction 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 RevokeRoleAction extends ProfileFormAction
         if (!Profile_role::isValid($this->role)) {
             // TRANS: Client error displayed when trying to revoke an invalid role.
             $this->clientError(_('Invalid role.'));
-            return false;
         }
         if (!Profile_role::isSettable($this->role)) {
             // TRANS: Client error displayed when trying to revoke a reserved role.
             $this->clientError(_('This role is reserved and cannot be set.'));
-            return false;
         }
 
         $cur = common_current_user();
@@ -74,7 +72,6 @@ class RevokeRoleAction extends ProfileFormAction
         if (!$cur->hasRight(Right::REVOKEROLE)) {
             // TRANS: Client error displayed when trying to revoke a role without having the right to do that.
             $this->clientError(_('You cannot revoke user roles on this site.'));
-            return false;
         }
 
         assert(!empty($this->profile)); // checked by parent
@@ -82,7 +79,6 @@ class RevokeRoleAction extends ProfileFormAction
         if (!$this->profile->hasRole($this->role)) {
             // TRANS: Client error displayed when trying to revoke a role that is not set.
             $this->clientError(_('User does not have this role.'));
-            return false;
         }
 
         return true;