projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e953b2c
)
QA Fix
author
atif-shaikh
<shaikh388@gmail.com>
Thu, 4 Dec 2014 05:38:09 +0000
(11:08 +0530)
committer
atif-shaikh
<shaikh388@gmail.com>
Thu, 4 Dec 2014 05:38:09 +0000
(11:08 +0530)
CRM/Core/BAO/ActionSchedule.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/BAO/ActionSchedule.php
b/CRM/Core/BAO/ActionSchedule.php
index 068f933ff7a3a6a3b5b93d72652cec8cf592fc8e..94b8e0ea66d6d5f437ab66a4fc2b20f2aecb0349 100644
(file)
--- a/
CRM/Core/BAO/ActionSchedule.php
+++ b/
CRM/Core/BAO/ActionSchedule.php
@@
-684,6
+684,9
@@
AND cas.entity_value = $id AND
while ($actionSchedule->fetch()) {
$extraSelect = $extraJoin = $extraWhere = $extraOn = '';
+ if ($actionSchedule->from_email)
+ $fromEmailAddress = "$actionSchedule->from_name <$actionSchedule->from_email>";
+
$activityTypeID = false;
$activityStatusID = false;
if ($actionSchedule->record_activity) {