fix CRM-12003

diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
index dcfcbc8492e4355d81801e6de64331f4c13cd027..47f4ce88eea9da7daa5fd5b1b69e25192df5c29d 100644 (file)
--- a/CRM/Contact/Form/Task/EmailCommon.php
+++ b/CRM/Contact/Form/Task/EmailCommon.php
@@ -71,10 +71,8 @@ class CRM_Contact_Form_Task_EmailCommon {
 
     foreach ($contactEmails as $emailId => $item) {
       $email = $item['email'];
-      if (!$email &&
-        (count($emails) <= 1)
-      ) {
-        $emails[$emailId] = '"' . $fromDisplayName . '"';
+      if (!$email && (count($emails) < 1)) {
+        // set it if no emails are present at all
         $form->_noEmails = TRUE;
       }
       else {
@@ -86,11 +84,11 @@ class CRM_Contact_Form_Task_EmailCommon {
 
           $emails[$emailId] = '"' . $fromDisplayName . '" <' . $email . '> ';
           $form->_onHold[$emailId] = $item['on_hold'];
+          $form->_noEmails = FALSE;
         }
       }
 
       $form->_emails[$emailId] = $emails[$emailId];
-
       $emails[$emailId] .= $item['locationType'];
 
       if ($item['is_primary']) {
@@ -99,6 +97,8 @@ class CRM_Contact_Form_Task_EmailCommon {
       $emails[$emailId] = htmlspecialchars($emails[$emailId]);
     }
 
+    CRM_Core_Error::debug($form->_noEmails, $emails); exit();
+
     $form->assign('noEmails', $form->_noEmails);
 
     if ($form->_noEmails) {