Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1131 diff -u -p -r1.1131 user.module --- modules/user/user.module 2 Mar 2010 09:12:31 -0000 1.1131 +++ modules/user/user.module 4 Mar 2010 04:36:44 -0000 @@ -386,20 +386,6 @@ function user_save($account, $edit = arr $field_names[] = $field['field_name']; } - foreach ($edit as $key => $value) { - // Form fields that don't pertain to the users, user_roles, or - // Field API are automatically serialized into the users.data - // column. - if (!in_array($key, array('roles', 'is_new')) && empty($user_fields[$key]) && empty($field_names[$key])) { - if ($value === NULL) { - unset($data[$key]); - } - else { - $data[$key] = $value; - } - } - } - // Process picture uploads. if (!empty($edit['picture']->fid)) { $picture = $edit['picture']; @@ -521,22 +507,6 @@ function user_save($account, $edit = arr user_module_invoke('insert', $edit, $user, $category); entity_invoke('insert', 'user', $user); - // Note, we wait with saving the data column to prevent module-handled - // fields from being saved there. - $data = array(); - foreach ($edit as $key => $value) { - // Form fields that don't pertain to the users, user_roles, or - // Field API are automatically serialized into the user.data - // column. - if ((!in_array($key, array('roles', 'is_new'))) && (empty($user_fields[$key]) && empty($field_form[$key])) && ($value !== NULL)) { - $data[$key] = $value; - } - } - if (!empty($data)) { - $data_array = array('uid' => $user->uid, 'data' => $data); - drupal_write_record('users', $data_array, 'uid'); - } - // Save user roles (delete just to be safe). if (isset($edit['roles']) && is_array($edit['roles'])) { db_delete('users_roles') Index: modules/user/user.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v retrieving revision 1.68 diff -u -p -r1.68 user.pages.inc --- modules/user/user.pages.inc 28 Feb 2010 20:10:34 -0000 1.68 +++ modules/user/user.pages.inc 4 Mar 2010 04:36:44 -0000 @@ -287,8 +287,6 @@ function user_profile_form_validate($for function user_profile_form_submit($form, &$form_state) { $account = $form['#user']; $category = $form['#user_category']; - // Remove unneeded values. - form_state_values_clean($form_state); $edit = (object)$form_state['values']; field_attach_submit('user', $edit, $form, $form_state);