Changeset 4340

Timestamp:

11/05/2012 05:54:23 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Use bbp_get_user_role() to get the user's forums role.
• Update bbp_set_user_role() to return false if trying to set a role the user already has.
• Remove foreach loop to remove existing roles, since there's no way to naturally have more than one.
• See #1939.

File:

• trunk/includes/users/functions.php (modified) (1 diff)

trunk/includes/users/functions.php

@@ -1388 +1388 @@
         if ( !empty( $user ) ) {
 
-                // Remove previous forum roles if any exist
-                $roles = array_intersect( array_values( $user->roles ), array_keys( bbp_get_editable_roles() ) );
-
-                if ( !empty( $roles ) ) {
-                        foreach ( $roles as $role ) {
+                // Get users forum role
+                $role = bbp_get_user_role( $user_id );
+
+                // User already has this role so no new role is set
+                if ( $new_role == $role ) {
+                        $new_role = false;
+
+                // Users role is different than the new role
+                } else {
+
+                        // Remove the old role
+                        if ( ! empty( $role ) ) {
                                 $user->remove_role( $role );
                         }
+
+                        // Add the new role
+                        $user->add_role( $new_role );
                 }
-
-                // Add new forums role
-                $user->add_role( $new_role );
 
         // User does don exist so return false