Merge pull request #12 from dlobo/CRM-12003

Fix for CRM-12003
civicrm · Mar 3, 2013 · 50a067f · 50a067f
2 parents 5af3d50 + 043b025
commit 50a067f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
@@ -71,10 +71,8 @@ static function preProcessFromAddress(&$form) {
 
     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 @@ static function preProcessFromAddress(&$form) {
 
           $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']) {