Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.176 diff -u -p -r1.176 install.php --- install.php 2 Jun 2009 06:58:15 -0000 1.176 +++ install.php 5 Jun 2009 17:11:59 -0000 @@ -1125,9 +1125,11 @@ function install_configure_form_validate if ($error = user_validate_name($form_state['values']['account']['name'])) { form_error($form['admin_account']['account']['name'], $error); } + $form_state['values']['account']['mail'] = trim($form_state['values']['account']['mail']); if ($error = user_validate_mail($form_state['values']['account']['mail'])) { form_error($form['admin_account']['account']['mail'], $error); } + $form_state['values']['site_mail'] = trim($form_state['values']['site_mail']); if ($error = user_validate_mail($form_state['values']['site_mail'])) { form_error($form['site_information']['site_mail'], $error); } Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.719 diff -u -p -r1.719 comment.module --- modules/comment/comment.module 3 Jun 2009 06:52:29 -0000 1.719 +++ modules/comment/comment.module 5 Jun 2009 17:12:00 -0000 @@ -1390,6 +1390,7 @@ function comment_validate($edit) { } if ($edit['mail']) { + $edit['mail'] = trim($edit['mail']); if (!valid_email_address($edit['mail'])) { form_set_error('mail', t('The e-mail address you specified is not valid.')); } Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.21 diff -u -p -r1.21 contact.pages.inc --- modules/contact/contact.pages.inc 10 May 2009 05:06:50 -0000 1.21 +++ modules/contact/contact.pages.inc 5 Jun 2009 17:12:00 -0000 @@ -105,6 +105,7 @@ function contact_site_form_validate($for if (!$form_state['values']['cid']) { form_set_error('cid', t('You must select a valid category.')); } + $form_state['values']['mail'] = trim($form_state['values']['mail']); if (!valid_email_address($form_state['values']['mail'])) { form_set_error('mail', t('You must enter a valid e-mail address.')); } Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.153 diff -u -p -r1.153 system.admin.inc --- modules/system/system.admin.inc 5 Jun 2009 05:28:28 -0000 1.153 +++ modules/system/system.admin.inc 5 Jun 2009 17:12:00 -0000 @@ -1245,6 +1245,7 @@ function system_site_information_setting */ function system_site_information_settings_validate($form, &$form_state) { // Validate the e-mail address. + $form_state['values']['site_mail'] = trim($form_state['values']['site_mail']); if ($error = user_validate_mail($form_state['values']['site_mail'])) { form_set_error('site_mail', $error); } Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.708 diff -u -p -r1.708 system.module --- modules/system/system.module 5 Jun 2009 05:28:28 -0000 1.708 +++ modules/system/system.module 5 Jun 2009 17:12:00 -0000 @@ -2057,6 +2057,7 @@ function system_send_email_action_form($ function system_send_email_action_validate($form, $form_state) { $form_values = $form_state['values']; // Validate the configuration form. + $form_values['recipient'] = trim($form_values['recipient']); if (!valid_email_address($form_values['recipient']) && $form_values['recipient'] != '%author') { // We want the literal %author placeholder to be emphasized in the error message. form_set_error('recipient', t('Please enter a valid email address or %author.', array('%author' => '%author')));