### Eclipse Workspace Patch 1.0
#P wordpress-trunk
Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 17565)
+++ wp-includes/user.php	(working copy)
@@ -1543,16 +1543,22 @@
  * @return int The updated user's ID.
  */
 function wp_update_user($userdata) {
-	$ID = (int) $userdata['ID'];
+	// Retrieve data of existing user (if any)
+	$user = array();
+	if ( empty( $userdata['ID'] ) ) {
+		$ID = 0;
+	} else {
+		$ID = (int) $userdata['ID'];
+		// First, get all of the original fields
+		if ( $return = get_userdata($ID) ) {
+			// Escape data pulled from DB.
+			$user = add_magic_quotes(get_object_vars($return));
+		}
+		unset( $return );
+	}
 
-	// First, get all of the original fields
-	$user = get_userdata($ID);
-
-	// Escape data pulled from DB.
-	$user = add_magic_quotes(get_object_vars($user));
-
 	// If password is changing, hash it now.
-	if ( ! empty($userdata['user_pass']) ) {
+	if ( !empty($ID) && ! empty($userdata['user_pass']) ) {
 		$plaintext_pass = $userdata['user_pass'];
 		$userdata['user_pass'] = wp_hash_password($userdata['user_pass']);
 	}