Changeset 21866

Timestamp:

09/16/2012 04:24:33 PM (13 years ago)

Author:

nacin

Message:

Don't use hard-coded indexes when dealing with an array of roles. props elyobo. fixes #19222.

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)

trunk/wp-admin/includes/ajax-actions.php

@@ -1023 +1023 @@
     $wp_list_table = _get_list_table('WP_Users_List_Table');
 
+    $role = current( $user_object->roles );
+
     $x = new WP_Ajax_Response( array(
         'what' => 'user',
         'id' => $user_id,
-        'data' => $wp_list_table->single_row( $user_object, '', $user_object->roles[0] ),
+        'data' => $wp_list_table->single_row( $user_object, '', $role ),
         'supplemental' => array(
             'show-link' => sprintf(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login),
-            'role' => $user_object->roles[0]
+            'role' => $role,
         )
     ) );

trunk/wp-includes/capabilities.php

@@ -787 +787 @@
             unset( $this->caps[$oldrole] );
 
-        if ( 1 == count( $this->roles ) && $role == $this->roles[0] )
+        if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
             return;