Changeset 17013

Timestamp:

12/17/2010 12:38:15 AM (16 years ago)

Author:

scribu

Message:

Make WP_User_Query return regular objects by default. Fixes #15854

Location:

trunk

Files:

• wp-admin/includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-users-list-table.php (modified) (1 diff)
• wp-includes/user.php (modified) (3 diffs)

trunk/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -28 +28 @@
                         'offset' => ( $paged-1 ) * $users_per_page,
                         'search' => $usersearch,
-                        'blog_id' => 0
+                        'blog_id' => 0,
+                        'fields' => 'all_with_meta'
                 );
 

trunk/wp-admin/includes/class-wp-users-list-table.php

@@ -48 +48 @@
                         'offset' => ( $paged-1 ) * $users_per_page,
                         'role' => $role,
-                        'search' => $usersearch
+                        'search' => $usersearch,
+                        'fields' => 'all_with_meta'
                 );
 

trunk/wp-includes/user.php

@@ -415 +415 @@
                                 $this->query_fields[] = $wpdb->users . '.' . esc_sql( $field );
                         $this->query_fields = implode( ',', $this->query_fields );
+                } elseif ( 'all' == $qv['fields'] ) {
+                        $this->query_fields = "$wpdb->users.*";
                 } else {
                         $this->query_fields = "$wpdb->users.ID";
@@ -523 +525 @@
                 global $wpdb;
 
-                if ( is_array( $this->query_vars['fields'] ) ) {
+                if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) {
                         $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
                 } else {
@@ -535 +537 @@
                         $this->total_users = $wpdb->get_var("SELECT COUNT($wpdb->users.ID) $this->query_from $this->query_where $this->query_orderby $this->query_limit");
 
-                if ( 'all' == $this->query_vars['fields'] ) {
-                        cache_users($this->results);
+                if ( 'all_with_meta' == $this->query_vars['fields'] ) {
+                        cache_users( $this->results );
 
                         $r = array();