Changeset 4364

Timestamp:

11/09/2012 09:26:57 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Introduce two helper functions: bbp_filter_user_roles_option() and _bbp_reinit_dynamic_roles()
• Fixes bug where switching to a new blog would wipe out dynamically loaded roles.
• Filter the *_user_roles option, and add bbPress's roles to it.
• See #1939.

Location:

trunk/includes/core

Files:

• actions.php (modified) (1 diff)
• capabilities.php (modified) (2 diffs)

trunk/includes/core/actions.php

@@ -69 +69 @@
 add_action( 'bbp_loaded', 'bbp_register_theme_packages',   14 );
 add_action( 'bbp_loaded', 'bbp_load_textdomain',           16 );
+add_action( 'bbp_loaded', 'bbp_filter_user_roles_option',  18 );
 
 /**

trunk/includes/core/capabilities.php

@@ -37 +37 @@
         case bbp_get_keymaster_role() :
             $caps = array(
+
+                // Keymasters only
+                'keep_gate'             => true,
 
                 // Primary caps
@@ -337 +340 @@
 
 /**
+ * Helper function to add filter to option_wp_user_roles
+ *
+ * @since bbPress (r4363)
+ *
+ * @see _bbp_reinit_dynamic_roles()
+ *
+ * @global WPDB $wpdb Used to get the database prefix
+ */
+function bbp_filter_user_roles_option() {
+    global $wpdb;
+
+    $role_key = $wpdb->prefix . 'user_roles';
+
+    add_filter( 'option_' . $role_key, '_bbp_reinit_dynamic_roles' );
+}
+
+/**
+ * This is necessary because in a few places (noted below) WordPress initializes
+ * a blog's roles directly from the database option. When this happens, the
+ * $wp_roles global gets flushed, causing a user to magically lose any
+ * dynamically assigned roles or capabilities when $current_user in refreshed.
+ *
+ * Because dynamic multiple roles is a new concept in WordPress, we work around
+ * it here for now, knowing that improvements will come to WordPress core later.
+ *
+ * @see switch_to_blog()
+ * @see restore_current_blog()
+ * @see WP_Roles::_init()
+ *
+ * @since bbPress (r4363)
+ *
+ * @internal Used by bbPress to reinitialize dynamic roles on blog switch
+ *
+ * @param array $roles
+ * @return array Combined array of database roles and dynamic bbPress roles
+ */
+function _bbp_reinit_dynamic_roles( $roles = array() ) {
+    foreach( bbp_get_dynamic_roles() as $role_id => $details ) {
+        $roles[$role_id] = $details;
+    }
+    return $roles;
+}
+
+/**
  * Fetch a filtered list of forum roles that the current user is
  * allowed to have.