Changeset 22248

Timestamp:

10/16/2012 08:05:40 PM (14 years ago)

Author:

ryan

Message:

Return WP_User objects when querying 'all' fields with WP_User_Query.
Allow passing stdClass or WP_User to the WP_User constructor.

fixes #22057

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (2 diffs)
• user.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -460 +460 @@
          * @access public
          *
-         * @param int|string $id User's ID
+         * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
          * @param string $name Optional. User's username
          * @param int $blog_id Optional Blog ID, defaults to current blog.
@@ -476 +476 @@
                                 $prefix . 'usersettingstime' => $prefix . 'user-settings-time',
                         );
+                }
+
+                if ( is_a( $id, 'WP_User' ) ) {
+                        $this->init( $id->data, $blog_id );
+                        return;
+                } elseif ( is_object( $id ) ) {
+                        $this->init( $id, $blog_id );
+                        return;
                 }
 

trunk/wp-includes/user.php

@@ -560 +560 @@
 
                         $this->results = $r;
+                } elseif ( 'all' == $qv['fields'] ) {
+                        foreach ( $this->results as $key => $user ) {
+                                $this->results[ $key ] = new WP_User( $user );
+                        }
                 }
         }