Changeset 4236 for trunk/bbp-admin/bbp-users.php

Timestamp:

10/09/2012 06:52:38 PM (12 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-admin/bbp-users.php (modified) (4 diffs)

trunk/bbp-admin/bbp-users.php

@@ -48 +48 @@
 
         // Admin styles
-        add_action( 'admin_head',               array( $this, 'admin_head'          ) );
+        add_action( 'admin_head',        array( $this, 'admin_head'          ) );
 
         // User profile edit/display actions
-        add_action( 'edit_user_profile',        array( $this, 'user_profile_forums' ) );
-
-        // User profile save actions
-        add_action( 'edit_user_profile_update', array( $this, 'user_profile_update' ) );
+        add_action( 'edit_user_profile', array( $this, 'user_profile_forums' ) );
 
         // Noop WordPress additional caps output area
@@ -70 +67 @@
      * @uses sanitize_html_class() To sanitize the classes
      */
-    public function admin_head() { 
+    public function admin_head() {
         ?>
 
@@ -80 +77 @@
                 vertical-align: top;
             }
-            
+
             div.bbp-user-capabilities h4 {
                 margin: 0 0 10px;
             }
-            
+
             p.bbp-default-caps-wrapper {
                 clear: both;
@@ -100 +97 @@
      * @since bbPress (r2464)
      *
-     * @param $user_id The user id
-     * @uses do_action() Calls 'bbp_user_profile_update'
-     * @return bool Always false
-     */
-    public function user_profile_update( $user_id ) { 
-
-        // Bail if no user
-        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 );
-        }
-    }
-
-    /**
-     * Responsible for saving additional profile options and settings
-     *
-     * @since bbPress (r2464)
-     *
      * @param WP_User $profileuser User data
      * @uses do_action() Calls 'bbp_user_profile_forums'
      * @return bool Always false
      */
-    public function user_profile_forums( $profileuser ) { 
+    public function user_profile_forums( $profileuser ) {
 
         // Bail if current user cannot edit users