Changeset 6120 for branches/2.5/includes/admin/users.php

Timestamp:

11/09/2016 10:53:16 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 bbp_translate_user_role() to help with outputting literal role names in the proper language

See #3017. 2.5 branch (for 2.5.11)

File:

• branches/2.5/includes/admin/users.php (modified) (3 diffs)

branches/2.5/includes/admin/users.php

@@ -104 +104 @@
                             <?php foreach ( $dynamic_roles as $role => $details ) : ?>
 
-                                <option <?php selected( $user_role, $role ); ?> value="<?php echo esc_attr( $role ); ?>"><?php echo translate_user_role( $details['name'] ); ?></option>
+                                <option <?php selected( $user_role, $role ); ?> value="<?php echo esc_attr( $role ); ?>"><?php echo bbp_translate_user_role( $details['name'] ); ?></option>
 
                             <?php endforeach; ?>
@@ -140 +140 @@
             <option value=''><?php esc_html_e( 'Change forum role to&hellip;', 'bbpress' ) ?></option>
             <?php foreach ( $dynamic_roles as $role => $details ) : ?>
-                <option value="<?php echo esc_attr( $role ); ?>"><?php echo translate_user_role( $details['name'] ); ?></option>
+                <option value="<?php echo esc_attr( $role ); ?>"><?php echo bbp_translate_user_role( $details['name'] ); ?></option>
             <?php endforeach; ?>
         </select><?php submit_button( __( 'Change', 'bbpress' ), 'secondary', 'bbp-change-role', false );
@@ -244 +244 @@
             if ( ! empty( $user_role ) ) {
                 $roles  = bbp_get_dynamic_roles();
-                $retval = translate_user_role( $roles[$user_role]['name'] );
+                $retval = bbp_translate_user_role( $roles[$user_role]['name'] );
             }
         }