Changeset 6147 for branches/2.5/includes/core/capabilities.php

Timestamp:

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

Author:

johnjamesjacoby

Message:

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

File:

• branches/2.5/includes/core/capabilities.php (modified) (2 diffs)

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;
 }