Changeset 4360

Timestamp:

11/08/2012 07:50:55 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Only setup the default current user role when the current user has been byref copied into bbPress's instance.
• Fixes issue where some core actions are suppressed during the deactivation process, causing an action order conflict with current_user.
• Fixes #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

@@ -118 +118 @@
 // Try to load the bbpress-functions.php file from the active themes
 add_action( 'bbp_after_setup_theme', 'bbp_load_theme_functions', 10 );
-
-// Multisite Global Forum Access
-add_action( 'bbp_setup_current_user', 'bbp_set_current_user_default_role', 10 );
 
 // Widgets