projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-19948: Store the logged in contact ID as the file uploader
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
Email.php
diff --git
a/CRM/Core/BAO/Email.php
b/CRM/Core/BAO/Email.php
index 83119c8b7277b8fb69669d01ff1a45e0d170e6c9..7be3aab41f47e93d6c274fd277ef8b3d1e3aa0a3 100644
(file)
--- a/
CRM/Core/BAO/Email.php
+++ b/
CRM/Core/BAO/Email.php
@@
-1,7
+1,7
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version
4.7
|
+ | CiviCRM version
5
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@
-237,13
+237,20
@@
ORDER BY e.is_primary DESC, email_id ASC ";
* Email object.
*/
public static function holdEmail(&$email) {
* Email object.
*/
public static function holdEmail(&$email) {
- if (!($email->on_hold === 'null' || $email->on_hold === NULL)) {
- $email->on_hold = intval($email->on_hold);
+ if ($email->id && $email->on_hold === NULL) {
+ // email is being updated but no change to on_hold.
+ return;
}
}
+ if ($email->on_hold === 'null' || $email->on_hold === NULL) {
+ // legacy handling, deprecated.
+ $email->on_hold = 0;
+ }
+ $email->on_hold = (int) $email->on_hold;
+
//check for update mode
if ($email->id) {
$params = array(1 => array($email->id, 'Integer'));
//check for update mode
if ($email->id) {
$params = array(1 => array($email->id, 'Integer'));
- if ($email->on_hold
&& $email->on_hold != 'null'
) {
+ if ($email->on_hold) {
$sql = "
SELECT id
FROM civicrm_email
$sql = "
SELECT id
FROM civicrm_email
@@
-255,7
+262,8
@@
AND hold_date IS NULL
$email->reset_date = 'null';
}
}
$email->reset_date = 'null';
}
}
- elseif ($email->on_hold == 'null') {
+ elseif ($email->on_hold === 0) {
+ // we do this lookup to see if reset_date should be changed.
$sql = "
SELECT id
FROM civicrm_email
$sql = "
SELECT id
FROM civicrm_email
@@
-272,7
+280,7
@@
AND reset_date IS NULL
}
}
else {
}
}
else {
- if (
($email->on_hold != 'null') &&
$email->on_hold) {
+ if ($email->on_hold) {
$email->hold_date = date('YmdHis');
}
}
$email->hold_date = date('YmdHis');
}
}