diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-05-11 11:03:12 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-05-11 11:03:12 +0000 |
| commit | a60a608ed86e8971d77760e9df3a0932efc88d00 (patch) | |
| tree | 9b257fc2ba3dd6a6288628eed840268819d7d7cd | |
| parent | fe04e7d35f72214f08446b12a22e09af0076cc2a (diff) | |
| download | brdo-a60a608ed86e8971d77760e9df3a0932efc88d00.tar.gz brdo-a60a608ed86e8971d77760e9df3a0932efc88d00.tar.bz2 | |
- Patch #655252 by quicksketch: custom e-mail action fails to accept token [node:author:mail] or [comment:author:mail].
| -rw-r--r-- | modules/system/system.module | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index cb423e1a3..aa42a5bd8 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2932,9 +2932,9 @@ function system_send_email_action_form($context) { function system_send_email_action_validate($form, $form_state) { $form_values = $form_state['values']; // Validate the configuration form. - if (!valid_email_address($form_values['recipient']) && $form_values['recipient'] != '%author') { + if (!valid_email_address($form_values['recipient']) && strpos($form_values['recipient'], ':mail') === FALSE) { // We want the literal %author placeholder to be emphasized in the error message. - form_set_error('recipient', t('Enter a valid email address or %author.', array('%author' => '%author'))); + form_set_error('recipient', t('Enter a valid email address or use a token e-mail address such as %author.', array('%author' => '[node:author:mail]'))); } } |