Changeset 4375

Timestamp:

11/09/2012 03:56:55 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Rehook bbp_set_current_user_default_role() back to 'bbp_setup_current_user'.
• Now that deactivation check has moved, it's safe to hook this directly again.
• Remove from bbPress::setup_current_user().
• See #1939.

Location:

trunk

Files:

• bbpress.php (modified) (1 diff)
• includes/core/actions.php (modified) (1 diff)

trunk/bbpress.php

@@ -822 +822 @@
     public function setup_current_user() {
         $this->current_user = &wp_get_current_user();
-
-        // Setup the default user role
-        bbp_set_current_user_default_role();
     }
 

trunk/includes/core/actions.php

@@ -100 +100 @@
  * role between sites. Note that if a user already has a role on that site, no
  * mapping will occur.
- */
-add_action( 'switch_blog', 'bbp_set_current_user_default_role', 1 );
+ *
+ * We also hook to 'bbp_setup_current_user' -- naturally.
+ */
+add_action( 'switch_blog',            'bbp_set_current_user_default_role' );
+add_action( 'bbp_setup_current_user', 'bbp_set_current_user_default_role' );
 
 /**