Changeset 4192

Timestamp:

09/04/2012 09:25:07 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Enforce negative capabilities in user_profile_update() by using add_cap( $cap, false );
• Remove new-role dance from capability reset, as bbPress capabilities are still added to each individual role as needed.

File:

• branches/plugin/bbp-admin/bbp-users.php (modified) (3 diffs)

branches/plugin/bbp-admin/bbp-users.php

@@ -110 +110 @@
 
         // Load up the user
-        $user      = new WP_User( $user_id );
-        $user_role = bbp_get_user_role( $user_id );
+        $user = new WP_User( $user_id );
 
         // Either reset caps for role
@@ -123 +122 @@
             }
 
-            // Maybe use users new role
-            if ( ! empty( $_POST['role'] ) ) {
-                $new_role = get_role( $_POST['role'] );
-                $new_role = isset( $new_role->name ) ? $new_role->name : '';
-
-                if ( $new_role != $user_role ) {
-                    $user_role = $new_role;
-                }
-            }
-
-            // Add back caps for current role
-            if ( !empty( $user_role ) ) {
-                foreach ( bbp_get_caps_for_role( $user_role ) as $capability ) {
-                    $user->add_cap( $capability, true );
-                }
-            }
-
         // Or set caps individually
         } else {
@@ -145 +127 @@
             // Loop through capability groups
             foreach ( bbp_get_capability_groups() as $group ) {
-
-                // Loop through capabilities
                 foreach ( bbp_get_capabilities_for_group( $group ) as $capability ) {
 
                     // Maybe add cap
                     if ( ! empty( $_POST['_bbp_' . $capability] ) && ! $user->has_cap( $capability ) ) {
-                        $user->add_cap( $capability );
+                        $user->add_cap( $capability, true );
 
                     // Maybe remove cap
                     } elseif ( empty( $_POST['_bbp_' . $capability] ) && $user->has_cap( $capability ) ) {
-                        $user->remove_cap( $capability );
+                        $user->add_cap( $capability, false );
                     }
                 }