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

Timestamp:

10/07/2011 02:34:41 AM (13 years ago)

Author:

ryan

Message:

Don't stomp meta fields in wp_update_user(). Props scribu. see #15458

File:

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

trunk/wp-includes/user.php

@@ -1355 +1355 @@
     }
 
-    update_user_meta( $user_id, 'first_name', $first_name );
-    update_user_meta( $user_id, 'last_name', $last_name );
-    update_user_meta( $user_id, 'nickname', $nickname );
-    update_user_meta( $user_id, 'description', $description );
-    update_user_meta( $user_id, 'rich_editing', $rich_editing );
-    update_user_meta( $user_id, 'comment_shortcuts', $comment_shortcuts );
-    update_user_meta( $user_id, 'admin_color', $admin_color );
-    update_user_meta( $user_id, 'use_ssl', $use_ssl );
-    update_user_meta( $user_id, 'show_admin_bar_front', $show_admin_bar_front );
-
-    $user = new WP_User($user_id);
-
-    foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
-        if ( empty($$method) )
-            $$method = '';
-
-        update_user_meta( $user_id, $method, $$method );
+    $user = new WP_User( $user_id );
+
+    foreach ( _get_additional_user_keys( $user ) as $key ) {
+        update_user_meta( $user_id, $key, $$key );
     }
 
@@ -1413 +1400 @@
 
     // First, get all of the original fields
-    $user = WP_User::get_data_by('id', $ID);
+    $user_obj = get_userdata( $ID );
+
+    $user = get_object_vars( $user_obj->data );
+
+    // Add additional custom fields
+    foreach ( _get_additional_user_keys( $user_obj ) as $key ) {
+        $user[ $key ] = get_user_meta( $ID, $key, true );
+    }
 
     // Escape data pulled from DB.
-    $user = add_magic_quotes(get_object_vars($user));
+    $user = add_magic_quotes( $user );
 
     // If password is changing, hash it now.
@@ -1465 +1459 @@
 }
 
+
+/**
+ * Return a list of meta keys that wp_insert_user() is supposed to set.
+ *
+ * @access private
+ * @since 3.3.0
+ *
+ * @param object $user WP_User instance
+ * @return array
+ */
+function _get_additional_user_keys( $user ) {
+    $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
+    return array_merge( $keys, array_keys( _wp_get_user_contactmethods( $user ) ) );
+}
 
 /**