summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.module3
-rw-r--r--modules/user/user.pages.inc3
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 3a0dded2a..2d400f54c 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3116,7 +3116,8 @@ function user_register_submit($form, &$form_state) {
// The unset below is needed to prevent these form values from being saved as
// user data.
- unset($form_state['values']['form_token'], $form_state['values']['submit'], $form_state['values']['op'], $form_state['values']['notify'], $form_state['values']['form_id'], $form_state['values']['affiliates'], $form_state['values']['destination'], $form_state['values']['form_build_id']);
+ form_state_values_clean($form_state);
+ unset($form_state['values']['notify']);
$form_state['values']['pass'] = $pass;
$form_state['values']['init'] = $form_state['values']['mail'];
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index fc88e395a..1f94e421d 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -269,7 +269,8 @@ function user_profile_form_validate($form, &$form_state) {
function user_profile_form_submit($form, &$form_state) {
$account = $form['#user'];
$category = $form['#user_category'];
- unset($form_state['values']['op'], $form_state['values']['submit'], $form_state['values']['cancel'], $form_state['values']['form_token'], $form_state['values']['form_id'], $form_state['values']['form_build_id']);
+ // Remove unneeded values.
+ form_state_values_clean($form_state);
$edit = (object)$form_state['values'];
field_attach_submit('user', $edit, $form, $form_state);