Changeset 21496 for trunk/wp-includes/user.php

Timestamp:

08/10/2012 03:36:54 PM (14 years ago)

Author:

ryan

Message:

Allow passing stdClass and WP_User to wp_insert_user() and wp_update_user(). Introduce WP_User::to_array(). Eliminate uses of get_object_vars() when passing to wp_*_user(). fixes #21429

File:

• trunk/wp-includes/user.php (modified) (3 diffs)

trunk/wp-includes/user.php

@@ -1241 +1241 @@
  * @uses do_action() Calls 'user_register' hook when creating a new user giving the user's ID
  *
- * @param array $userdata An array of user data.
+ * @param mixed $userdata An array of user data or a user object of type stdClass or WP_User.
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not be created.
  */
-function wp_insert_user($userdata) {
+function wp_insert_user( $userdata ) {
     global $wpdb;
 
-    extract($userdata, EXTR_SKIP);
+    if ( is_a( $userdata, 'stdClass' ) )
+        $userdata = get_object_vars( $userdata );
+    elseif ( is_a( $userdata, 'WP_User' ) )
+        $userdata = $userdata->to_array();
+
+    extract( $userdata, EXTR_SKIP );
 
     // Are we updating or creating?
@@ -1388 +1393 @@
  * @uses wp_insert_user() Used to update existing user or add new one if user doesn't exist already
  *
- * @param array $userdata An array of user data.
+ * @param mixed $userdata An array of user data or a user object of type stdClass or WP_User.
  * @return int The updated user's ID.
  */
 function wp_update_user($userdata) {
+    if ( is_a( $userdata, 'stdClass' ) )
+        $userdata = get_object_vars( $userdata );
+    elseif ( is_a( $userdata, 'WP_User' ) )
+        $userdata = $userdata->to_array();
+
     $ID = (int) $userdata['ID'];
 
@@ -1397 +1407 @@
     $user_obj = get_userdata( $ID );
 
-    $user = get_object_vars( $user_obj->data );
+    $user = $user_obj->to_array();
 
     // Add additional custom fields