diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/form.inc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/includes/form.inc b/includes/form.inc index 4c77f9c59..5aef91b19 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -713,6 +713,18 @@ function theme_password_confirm($element) { return theme('form_element', $element['#title'], '<div class="container-inline">'. $element['#children']. '</div>', $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); } +/* + * Expand a password_confirm field into two text boxes. + */ +function expand_password_confirm($element) { + $element['pass1'] = array('#type' => 'password', '#size' => 12, '#value' => $element['#value']['pass1']); + $element['pass2'] = array('#type' => 'password', '#size' => 12, '#value' => $element['#value']['pass2']); + $element['#validate'] = array('password_confirm_validate' => array()); + $element['#tree'] = TRUE; + + return $element; +} + /** * Validate password_confirm element. */ @@ -725,13 +737,12 @@ function password_confirm_validate($form) { form_set_value($form, $pass1); if ($pass1 != $pass2) { form_error($form, t('The specified passwords do not match.')); - form_error($form['pass1']); - form_error($form['pass2']); } } elseif ($form['#required'] && !empty($_POST['edit'])) { - form_set_error('pass1', t('Password field is required.')); + form_error($form, t('Password field is required.')); } + return $form; } |