Changeset 4317

Timestamp:

11/03/2012 08:05:30 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Use correct 'bbp_set_user_role' filter name.
• Reset user caps when setting auto-role.
• See #1939.

Location:

trunk/includes/users

Files:

• capabilities.php (modified) (2 diffs)
• functions.php (modified) (1 diff)

trunk/includes/users/capabilities.php

@@ -194 +194 @@
 
         // Fromus role we want the user to have
-        $new_role    = stripslashes( $_POST['bbp-forums-role'] );
+        $new_role    = sanitize_text_field( $_POST['bbp-forums-role'] );
         $forums_role = bbp_get_user_role( $user_id );
 
@@ -257 +257 @@
         return;
 
+    // Remove any interim bbPress caps
+    bbp_remove_user_caps( $user_id );
+
     // Assign the default role to the current user
     bbpress()->current_user->add_role( bbp_get_default_role() );

trunk/includes/users/functions.php

@@ -1405 +1405 @@
     }
 
-    return apply_filters( 'bbp_get_user_role', $new_role, $user_id, $user );
+    return apply_filters( 'bbp_set_user_role', $new_role, $user_id, $user );
 }