Ticket #15791: 15791.diff

wp-includes/user.php

@@ -928 +928 @@
  * The available arguments are as follows:
  * <ol>
  * <li>show_option_all - Text to show all and whether HTML option exists.</li>
- * <li>show_option_none - Text for show none and whether HTML option exists.
- *     </li>
- * <li>orderby - SQL order by clause for what order the users appear. Default is
- * 'display_name'.</li>
+ * <li>show_option_none - Text for show none and whether HTML option exists.</li>
+ * <li>orderby - SQL order by clause for what order the users appear. Default is 'name' (for display_name).</li>
  * <li>order - Default is 'ASC'. Can also be 'DESC'.</li>
  * <li>include - User IDs to include.</li>
  * <li>exclude - User IDs to exclude.</li>
  * <li>multi - Default is 'false'. Whether to skip the ID attribute on the 'select' element. A 'true' value is overridden when id argument is set.</li>
- * <li>show - Default is 'display_name'. User table column to display. If the selected item is empty then the user_login will be displayed in parentesis</li>
+ * <li>show - Default is 'display_name'. User table column to display. If the selected item is empty then the user_login will be displayed in parentheses</li>
  * <li>echo - Default is '1'. Whether to display or retrieve content.</li>
  * <li>selected - Which User ID is selected.</li>
  * <li>name - Default is 'user'. Name attribute of select element.</li>
@@ -955 +953 @@
         global $wpdb;
         $defaults = array(
                 'show_option_all' => '', 'show_option_none' => '',
-                'orderby' => 'display_name', 'order' => 'ASC',
+                'orderby' => 'name', 'order' => 'ASC',
                 'include' => '', 'exclude' => '', 'multi' => 0,
                 'show' => 'display_name', 'echo' => 1,
                 'selected' => 0, 'name' => 'user', 'class' => '', 'blog_id' => $GLOBALS['blog_id'],
@@ -967 +965 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
 
-        $users = get_users( wp_array_slice_assoc( $args, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) ) );
+        $users = get_users( wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) ) );
 
         $output = '';
         if ( !empty($users) ) {