Changeset 4759

Timestamp:

02/07/2013 01:59:43 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Backport roles improvements to 2.2 branch.

• bbp_add_forums_roles() now returns the modified roles global.
• Hardening around saving a user's role when editing their profile.
• Call bbp_add_forums_roles() in a few places to make sure roles are added before using add_role() or set_role().

Location:

branches/2.2/includes

Files:

• core/capabilities.php (modified) (1 diff)
• users/capabilities.php (modified) (9 diffs)

branches/2.2/includes/core/capabilities.php

@@ -336 +336 @@
         $wp_roles->role_names[$role_id]   = $details['name'];
     }
+
+    return $wp_roles;
 }
 

branches/2.2/includes/users/capabilities.php

@@ -82 +82 @@
             // Add the new role
             if ( !empty( $new_role ) ) {
+
+                // Make sure bbPress roles are added
+                bbp_add_forums_roles();
+
                 $user->add_role( $new_role );
             }
@@ -137 +141 @@
  */
 function bbp_get_user_blog_role( $user_id = 0 ) {
-    global $wp_roles;
-
-    // This really shold not be necessary anymore, and will likely be removed
-    // at a later date. If roles aren't loaded yet, something else is wrong.
-    if ( ! isset( $wp_roles ) )
-        $wp_roles = new WP_Roles();
+
+    // Add bbPress roles (returns $wp_roles global)
+    $wp_roles  = bbp_add_forums_roles();
 
     // Validate user id
@@ -164 +165 @@
 
 /**
- * Helper function hooked to 'bbp_edit_user_profile_update' action to save or
+ * Helper function hooked to 'bbp_profile_update' action to save or
  * update user roles and capabilities.
  *
@@ -187 +188 @@
     $forums_role = bbp_get_user_role( $user_id );
 
+    // Bail if no role change
+    if ( $new_role == $forums_role )
+        return;
+
+    // Bail if trying to set their own role
+    if ( bbp_is_user_home_edit() )
+        return;
+
+    // Bail if current user cannot promote the passing user
+    if ( ! current_user_can( 'promote_user', $user_id ) )
+        return;
+
     // Set the new forums role
-    if ( $new_role != $forums_role ) {
-        bbp_set_user_role( $user_id, $new_role );
-    }
+    bbp_set_user_role( $user_id, $new_role );
 }
 
@@ -267 +278 @@
     // Add the user to the site
     if ( true == $add_to_site ) {
+
+        // Make sure bbPress roles are added
+        bbp_add_forums_roles();
+
         $bbp->current_user->add_role( $new_role );
 
     // Don't add the user, but still give them the correct caps dynamically
-    } else {        
+    } else {
         $bbp->current_user->caps[$new_role] = true;
         $bbp->current_user->get_role_caps();
@@ -370 +385 @@
     // Bail if no user ID
     if ( empty( $user_id ) )
-        return;
+        return false;
 
     // Bail if user ID is super admin
     if ( is_super_admin( $user_id ) )
-        return;
+        return false;
 
     // Arm the torpedos
@@ -422 +437 @@
         restore_current_blog();
     }
+
+    // Success
+    return true;
 }
 
@@ -455 +473 @@
     // Bail if no user ID
     if ( empty( $user_id ) )
-        return;
+        return false;
 
     // Bail if user ID is super admin
     if ( is_super_admin( $user_id ) )
-        return;
+        return false;
 
     // Arm the torpedos
@@ -507 +525 @@
         restore_current_blog();
     }
+
+    // Success
+    return true;
 }