Changeset 40323

Timestamp:

03/24/2017 02:52:26 PM (8 years ago)

Author:

johnbillion

Message:

Users: Don't push the current user's role to the top of the list in wp_dropdown_roles().

This brings consistency to the order in which roles are displayed in the Roles dropdown when editing users.

Props bor0

Fixes #40162

File:

• trunk/src/wp-admin/includes/template.php (modified) (2 diffs)

trunk/src/wp-admin/includes/template.php

@@ -822 +822 @@
  */
 function wp_dropdown_roles( $selected = '' ) {
-    $p = '';
     $r = '';
 
@@ -829 +828 @@
     foreach ( $editable_roles as $role => $details ) {
         $name = translate_user_role($details['name'] );
-        if ( $selected == $role ) // preselect specified role
-            $p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
-        else
-            $r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
-    }
-    echo $p . $r;
+        // preselect specified role
+        if ( $selected == $role ) {
+            $r .= "\n\t<option selected='selected' value='" . esc_attr( $role ) . "'>$name</option>";
+        } else {
+            $r .= "\n\t<option value='" . esc_attr( $role ) . "'>$name</option>";
+        }
+    }
+
+    echo $r;
 }