Changeset 4302

Timestamp:

11/02/2012 07:26:22 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Update bbp_edit_user_blog_role() and bbp_edit_user_forums_role() to use appropriate functions to get role arrays.
• See #1939.

File:

• trunk/includes/users/template-tags.php (modified) (3 diffs)

trunk/includes/users/template-tags.php

@@ -975 +975 @@
         return;
 
-    $user_role = bbp_get_user_role( bbp_get_displayed_user_id() ); ?>
-    
+    // Get users current blog role
+    $user      = get_userdata( bbp_get_displayed_user_id() );
+    $user_role = isset( $user->roles ) ? array_shift( $user->roles ) : ''; ?>
+
     <select name="role" id="role">
         <option value=""><?php _e( '&mdash; No role for this site &mdash;', 'bbpress' ); ?></option>
@@ -983 +985 @@
 
             <option <?php selected( $user_role, $role ); ?> value="<?php echo esc_attr( $role ); ?>"><?php echo translate_user_role( $details['name'] ); ?></option>
-            
+
         <?php endforeach; ?>
 
@@ -1002 +1004 @@
         return;
 
-    $user_role = bbp_get_user_role( bbp_get_displayed_user_id(), 'bbpress' ); ?>
-    
+    $user_role = bbp_get_user_role( bbp_get_displayed_user_id() ); ?>
+
     <select name="bbp-forums-role" id="bbp-forums-role">
-
-        <?php foreach ( bbp_get_forums_editable_roles() as $role => $details ) : ?>
+        <option value=""><?php _e( '&mdash; No role for this forum &mdash;', 'bbpress' ); ?></option>
+
+        <?php foreach ( bbp_get_editable_roles() as $role => $details ) : ?>
 
             <option <?php selected( $user_role, $role ); ?> value="<?php echo esc_attr( $role ); ?>"><?php echo translate_user_role( $details['name'] ); ?></option>
-            
+
         <?php endforeach; ?>