Changeset 6118 for trunk/src/includes/core/capabilities.php

Timestamp:

11/09/2016 09:51:11 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Roles: Fix infinite loops from load order changes in WordPress 4.7.

• Do not translate "role names" which are actually role IDs
• Add dummy function so literal role names are part of the pomo dictionary
• Introduce common/locale.php for future localization code
• Introduce roles variable to main bbPress class, and store loaded roles there
• Introduce bbp_translate_user_role() to help with outputting literal role names in the proper language

See #3017. For trunk (2.6)

File:

• trunk/src/includes/core/capabilities.php (modified) (6 diffs)

trunk/src/includes/core/capabilities.php

@@ -288 +288 @@
 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();
-    }
+    // Get the dynamic roles
+    $bbp_roles = bbp_get_dynamic_roles();
 
     // Loop through dynamic roles and add them to the $wp_roles array
-    foreach ( bbp_get_dynamic_roles() as $role_id => $details ) {
+    foreach ( $bbp_roles as $role_id => $details ) {
         $wp_roles->roles[ $role_id ]        = $details;
         $wp_roles->role_objects[ $role_id ] = new WP_Role( $role_id, $details['capabilities'] );
@@ -363 +361 @@
  *
  * @since 2.2.0 bbPress (r4284)
+ * @since 2.6.0 bbPress (r6117) Use bbpress()->roles
  *
  * @return array
  */
 function bbp_get_dynamic_roles() {
-    static $bbp_roles = null;
-
-    // Only run once
-    if ( null === $bbp_roles ) {
-        $bbp_roles = array(
-
-            // Keymaster
-            bbp_get_keymaster_role() => array(
-                'name'         => __( 'Keymaster', 'bbpress' ),
-                'capabilities' => bbp_get_caps_for_role( bbp_get_keymaster_role() )
-            ),
-
-            // Moderator
-            bbp_get_moderator_role() => array(
-                'name'         => __( 'Moderator', 'bbpress' ),
-                'capabilities' => bbp_get_caps_for_role( bbp_get_moderator_role() )
-            ),
-
-            // Participant
-            bbp_get_participant_role() => array(
-                'name'         => __( 'Participant', 'bbpress' ),
-                'capabilities' => bbp_get_caps_for_role( bbp_get_participant_role() )
-            ),
-
-            // Spectator
-            bbp_get_spectator_role() => array(
-                'name'         => __( 'Spectator', 'bbpress' ),
-                'capabilities' => bbp_get_caps_for_role( bbp_get_spectator_role() )
-            ),
-
-            // Blocked
-            bbp_get_blocked_role() => array(
-                'name'         => __( 'Blocked', 'bbpress' ),
-                'capabilities' => bbp_get_caps_for_role( bbp_get_blocked_role() )
-            )
-        );
+
+    // Defaults
+    $to_array = array();
+    $roles    = bbpress()->roles;
+
+    // Convert WP_Roles objects to arrays
+    foreach ( $roles as $role_id => $wp_role ) {
+        $to_array[ $role_id ] = (array) $wp_role;
     }
 
     // Filter & return
-    return (array) apply_filters( 'bbp_get_dynamic_roles', $bbp_roles );
+    return (array) apply_filters( 'bbp_get_dynamic_roles', $to_array, $roles );
 }
 
@@ -413 +384 @@
  *
  * @since 2.3.0 bbPress (r4792)
+ * @since 2.6.0 bbPress (r6117) Use bbp_translate_user_role()
  *
  * @param string $role_id
@@ -419 +391 @@
 function bbp_get_dynamic_role_name( $role_id = '' ) {
     $roles = bbp_get_dynamic_roles();
-    $role  = isset( $roles[ $role_id ] ) ? $roles[ $role_id ]['name'] : '';
+    $role  = isset( $roles[ $role_id ] )
+        ? bbp_translate_user_role( $roles[ $role_id ]['name'] )
+        : '';
 
     return apply_filters( 'bbp_get_dynamic_role_name', $role, $role_id, $roles );
@@ -433 +407 @@
  *
  * @param array $all_roles All registered roles
- * @return array 
+ * @return array
  */
 function bbp_filter_blog_editable_roles( $all_roles = array() ) {
@@ -527 +501 @@
  * Removes bbPress-specific user roles from the `wp_user_roles` array.
  *
- * This is currently only used when updating, uninstalling, or resetting bbPress. 
+ * This is currently only used when updating, uninstalling, or resetting bbPress.
  *
  * @see bbp_admin_reset_handler()