Changeset 4352

Timestamp:

11/07/2012 08:38:03 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Rename bbp_get_editable_roles() to bbp_get_dynamic_roles().
• This new function name better represents bbPress's approach to secondary user roles, in that these roles are no longer intentionally saved to the database.
• See #1939.

Location:

trunk/includes

Files:

• admin/settings.php (modified) (1 diff)
• admin/users.php (modified) (2 diffs)
• core/capabilities.php (modified) (3 diffs)
• users/capabilities.php (modified) (1 diff)
• users/template-tags.php (modified) (1 diff)

trunk/includes/admin/settings.php

@@ -512 +512 @@
     <select name="_bbp_default_role" id="_bbp_default_role" <?php bbp_maybe_admin_setting_disabled( '_bbp_default_role' ); ?>>
 
-        <?php foreach ( bbp_get_editable_roles() as $role => $details ) : ?>
+        <?php foreach ( bbp_get_dynamic_roles() as $role => $details ) : ?>
 
             <option <?php selected( $default_role, $role ); ?> value="<?php echo esc_attr( $role ); ?>"><?php echo translate_user_role( $details['name'] ); ?></option>

trunk/includes/admin/users.php

@@ -91 +91 @@
                             <?php endif; ?>
 
-                            <?php foreach ( bbp_get_editable_roles() as $role => $details ) : ?>
+                            <?php foreach ( bbp_get_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>
@@ -145 +145 @@
             // Translate user role for display
             if ( ! empty( $user_role ) ) {
-                $roles  = bbp_get_editable_roles();
+                $roles  = bbp_get_dynamic_roles();
                 $retval = translate_user_role( $roles[$user_role]['name'] );
             }

trunk/includes/core/capabilities.php

@@ -329 +329 @@
     $wp_roles = bbp_get_wp_roles();
 
-    foreach( bbp_get_editable_roles() as $role_id => $details ) {
+    foreach( bbp_get_dynamic_roles() as $role_id => $details ) {
         $wp_roles->roles[$role_id]        = $details;
         $wp_roles->role_objects[$role_id] = new WP_Role( $details['name'], $details['capabilities'] );
@@ -353 +353 @@
  * @return array
  */
-function bbp_get_editable_roles() {
-    return (array) apply_filters( 'bbp_get_editable_roles', array(
+function bbp_get_dynamic_roles() {
+    return (array) apply_filters( 'bbp_get_dynamic_roles', array(
 
         // Keymaster
@@ -403 +403 @@
  */
 function bbp_filter_blog_editable_roles( $all_roles = array() ) {
-    return array_diff_assoc( $all_roles, bbp_get_editable_roles() );
+    return array_diff_assoc( $all_roles, bbp_get_dynamic_roles() );
 }
 

trunk/includes/users/capabilities.php

@@ -112 +112 @@
     // User has roles so lets
     if ( ! empty( $user->roles ) ) {
-        $roles = array_intersect( array_values( $user->roles ), array_keys( bbp_get_editable_roles() ) );
+        $roles = array_intersect( array_values( $user->roles ), array_keys( bbp_get_dynamic_roles() ) );
 
         // If there's a role in the array, use the first one

trunk/includes/users/template-tags.php

@@ -1009 +1009 @@
         <option value=""><?php _e( '&mdash; No role for this forum &mdash;', 'bbpress' ); ?></option>
 
-        <?php foreach ( bbp_get_editable_roles() as $role => $details ) : ?>
+        <?php foreach ( bbp_get_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>