Changeset 6147

Timestamp:

12/09/2016 07:30:14 AM (4 years ago)

Author:

johnjamesjacoby

Message:

Roles: Port bbp_roles_init() from trunk to 2.5 branch. See: #3028.

Location:

branches/2.5/includes/core

Files:

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

branches/2.5/includes/core/actions.php

@@ -46 +46 @@
 add_action( 'wp_head',                  'bbp_head',                   10    );
 add_action( 'wp_footer',                'bbp_footer',                 10    );
+add_action( 'wp_roles_init',            'bbp_roles_init',             10    );
 add_action( 'set_current_user',         'bbp_setup_current_user',     10    );
 add_action( 'setup_theme',              'bbp_setup_theme',            10    );
@@ -85 +86 @@
 
 /**
- * There is no action API for roles to use, so hook in immediately after
- * everything is included (including the theme's functions.php. This is after
- * the $wp_roles global is set but before $wp->init().
- *
- * If it's hooked in any sooner, role names may not be translated correctly.
- *
- * @link http://bbpress.trac.wordpress.org/ticket/2219
- *
- * This is kind of lame, but is all we have for now.
- */
-add_action( 'bbp_after_setup_theme', 'bbp_add_forums_roles', 1 );
+ * bbp_roles_init - Attached to 'wp_roles_init' above
+ */
+add_action( 'bbp_roles_init', 'bbp_add_forums_roles', 1 );
 
 /**

branches/2.5/includes/core/capabilities.php

@@ -293 +293 @@
  * @since bbPress (r4290)
  *
+ * @param WP_Roles $wp_roles The main WordPress roles global
+ *
  * @uses bbp_get_wp_roles() To load and get the $wp_roles global
  * @uses bbp_get_dynamic_roles() To get and add bbPress's roles to $wp_roles
  * @return WP_Roles The main $wp_roles global
  */
-function bbp_add_forums_roles() {
-    $wp_roles = bbp_get_wp_roles();
-
+function bbp_add_forums_roles( $wp_roles = null ) {
+
+    // Attempt to get global roles if not passed in & not mid-initialization
+    if ( ( null === $wp_roles ) && ! doing_action( 'wp_roles_init' ) ) {
+        $wp_roles = bbp_get_wp_roles();
+    }
+
+    // Loop through dynamic roles and add them to the $wp_roles array
     foreach ( bbp_get_dynamic_roles() as $role_id => $details ) {
         $wp_roles->roles[$role_id]        = $details;
@@ -306 +313 @@
     }
 
+    // Return the modified $wp_roles array
     return $wp_roles;
 }

branches/2.5/includes/core/sub-actions.php

@@ -131 +131 @@
 function bbp_widgets_init() {
     do_action( 'bbp_widgets_init' );
+}
+
+/**
+ * Initialize roles
+ *
+ * @since bbPress (r3389)
+ *
+ * @param WP_Roles $wp_roles The main WordPress roles global
+ *
+ * @uses do_action() Calls 'bbp_roles_init'
+ */
+function bbp_roles_init( $wp_roles = null ) {
+    do_action( 'bbp_roles_init', $wp_roles );
 }