Changeset 21496

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

Location:

trunk

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/user.php (modified) (3 diffs)

trunk/wp-admin/includes/user.php

@@ -157 +157 @@
 
         if ( $update ) {
-                $user_id = wp_update_user( get_object_vars( $user ) );
-        } else {
-                $user_id = wp_insert_user( get_object_vars( $user ) );
+                $user_id = wp_update_user( $user );
+        } else {
+                $user_id = wp_insert_user( $user );
                 wp_new_user_notification( $user_id, isset($_POST['send_password']) ? $pass1 : '' );
         }

trunk/wp-admin/user-edit.php

@@ -83 +83 @@
         $new_email = get_option( $current_user->ID . '_new_email' );
         if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
+                $user = new stdClass;
                 $user->ID = $current_user->ID;
                 $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
                 if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
                         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
-                wp_update_user( get_object_vars( $user ) );
+                wp_update_user( $user );
                 delete_option( $current_user->ID . '_new_email' );
                 wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );

trunk/wp-includes/capabilities.php

@@ -664 +664 @@
         function has_prop( $key ) {
                 return $this->__isset( $key );
+        }
+
+        /*
+         * Return an array representation.
+         *
+         * @since 3.5.0
+         *
+         * @return array Array representation.
+         */
+        function to_array() {
+                return get_object_vars( $this->data );
         }
 

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