projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #16986 from colemanw/importParser
[civicrm-core.git]
/
CRM
/
Mailing
/
BAO
/
Mailing.php
diff --git
a/CRM/Mailing/BAO/Mailing.php
b/CRM/Mailing/BAO/Mailing.php
index 4951fe4bea9cbdbedd6bff354a4da8627b0435b0..a2b20bcf32dd27d459df3020d808f00d6876a3e6 100644
(file)
--- a/
CRM/Mailing/BAO/Mailing.php
+++ b/
CRM/Mailing/BAO/Mailing.php
@@
-1080,15
+1080,18
@@
ORDER BY civicrm_email.is_bulkmail DESC
elseif ($contactId === 0) {
//anonymous user
$contact = [];
elseif ($contactId === 0) {
//anonymous user
$contact = [];
- CRM_Utils_Hook::tokenValues($contact,
$contactId
, $job_id);
+ CRM_Utils_Hook::tokenValues($contact,
[$contactId]
, $job_id);
}
else {
$params = [['contact_id', '=', $contactId, 0, 0]];
list($contact) = CRM_Contact_BAO_Query::apiQuery($params);
}
else {
$params = [['contact_id', '=', $contactId, 0, 0]];
list($contact) = CRM_Contact_BAO_Query::apiQuery($params);
+ // $contact is an array of [ contactID => contactDetails ]
- //
CRM-4524
-
$contact = reset($contact
);
+ //
also call the hook to get contact details
+
CRM_Utils_Hook::tokenValues($contact, [$contactId], $job_id
);
+ // Don't send if contact doesn't exist
+ $contact = reset($contact);
if (!$contact || is_a($contact, 'CRM_Core_Error')) {
CRM_Core_Error::debug_log_message(ts('CiviMail will not send email to a non-existent contact: %1',
[1 => $contactId]
if (!$contact || is_a($contact, 'CRM_Core_Error')) {
CRM_Core_Error::debug_log_message(ts('CiviMail will not send email to a non-existent contact: %1',
[1 => $contactId]
@@
-1098,9
+1101,6
@@
ORDER BY civicrm_email.is_bulkmail DESC
$res = NULL;
return $res;
}
$res = NULL;
return $res;
}
-
- // also call the hook to get contact details
- CRM_Utils_Hook::tokenValues($contact, $contactId, $job_id);
}
$pTemplates = $this->getPreparedTemplates();
}
$pTemplates = $this->getPreparedTemplates();