From a60a608ed86e8971d77760e9df3a0932efc88d00 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 11 May 2010 11:03:12 +0000
Subject: - Patch #655252 by quicksketch: custom e-mail action fails to accept
 token [node:author:mail] or [comment:author:mail].

---
 modules/system/system.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/system/system.module')

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]')));
   }
 }
 
-- 
cgit v1.2.3