Changeset 4236 for trunk/bbp-includes/bbp-core-caps.php

Timestamp:

10/09/2012 06:52:38 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Introduce sub-action for saving a users profile.
• Hook capability saving functions to this new action.
• Remove duplicate admin routine from /bbp-admin/bbp-users.php.
• Remove hardcoded capability saving from bbp_edit_user_handler().
• Add edit_user capability checks to cap save and reset functions.
• Fixes bug when caps would be lost when a user saves their own profile.
• Fixes #1963.

File:

• trunk/bbp-includes/bbp-core-caps.php (modified) (3 diffs)

trunk/bbp-includes/bbp-core-caps.php

@@ -875 +875 @@
         return false;
 
-    // Bail if not a member of this blog
-    if ( ! user_can( $user_id, 'read' ) )
+    // Bail if current user cannot edit this user
+    if ( ! current_user_can( 'edit_user', $user_id ) )
         return false;
 
@@ -914 +914 @@
         return false;
 
-    // Bail if not a member of this blog
-    if ( ! user_can( $user_id, 'read' ) )
+    // Bail if current user cannot edit this user
+    if ( ! current_user_can( 'edit_user', $user_id ) )
         return false;
 
@@ -938 +938 @@
     // Success
     return true;
+}
+
+/**
+ * Helper function hooked to 'bbp_edit_user_profile_update' action to save or update
+ * user roles and capabilities.
+ *
+ * @since bbPress (r4235)
+ *
+ * @param int $user_id
+ * @uses bbp_reset_user_caps() to reset caps
+ * @usse bbp_save_user_caps() to save caps
+ */
+function bbp_edit_user_profile_update_capabilities( $user_id = 0 ) {
+
+    // Bail if no user ID was passed
+    if ( empty( $user_id ) )
+        return;
+
+    // Either reset caps for role
+    if ( ! empty( $_POST['bbp-default-caps'] ) ) {
+        bbp_reset_user_caps( $user_id );
+
+    // Or set caps individually
+    } else {
+        bbp_save_user_caps( $user_id );
+    }
 }