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 #3949 from colemanw/CRM-15156
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
Email.php
diff --git
a/CRM/Core/BAO/Email.php
b/CRM/Core/BAO/Email.php
index 258cb4de4e8d07550e31b189d3788ec23f9cd5e2..61a9370068ef3ac94440cccdf877a438533cffca 100644
(file)
--- a/
CRM/Core/BAO/Email.php
+++ b/
CRM/Core/BAO/Email.php
@@
-320,6
+320,9
@@
AND reset_date IS NULL
return $fromEmailValues;
}
+ /**
+ * @return object
+ */
static function isMultipleBulkMail() {
return CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, 'civimail_multiple_bulk_emails', NULL, FALSE);
}