From bc8832797ca74c015fd58bff28f2f10135997351 Mon Sep 17 00:00:00 2001 From: yashodha Date: Mon, 22 Jun 2015 18:07:55 +0530 Subject: [PATCH] cleanup --- CRM/Activity/BAO/Activity.php | 3 ++- CRM/Activity/Form/Activity.php | 16 ++++++++-------- CRM/Contact/Form/Task/EmailCommon.php | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index e34301eae7..7d5bbc9280 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -2733,7 +2733,7 @@ INNER JOIN civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n * @param object $activity * @param array $mailToContacts * - * @return boolean + * @return bool */ public static function sendToAssignee($activity, $mailToContacts) { if (!CRM_Utils_array::crmIsEmptyArray($mailToContacts)) { @@ -2747,4 +2747,5 @@ INNER JOIN civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n } return FALSE; } + } diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index ef3e8bfa5a..b8241aabc9 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -1089,11 +1089,11 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { } } - $sent = CRM_Activity_BAO_Activity::sendToAssignee($activity, $mailToContacts); - if ($sent) { - $mailStatus .= ts("A copy of the activity has also been sent to assignee contacts(s)."); - } - } + $sent = CRM_Activity_BAO_Activity::sendToAssignee($activity, $mailToContacts); + if ($sent) { + $mailStatus .= ts("A copy of the activity has also been sent to assignee contacts(s)."); + } + } // Also send email to follow-up activity assignees if set if ($followupActivity) { @@ -1105,9 +1105,9 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { } $sentFollowup = CRM_Activity_BAO_Activity::sendToAssignee($followupActivity, $mailToFollowupContacts); - if ($sentFollowup) { - $mailStatus .= '
' . ts("A copy of the follow-up activity has also been sent to follow-up assignee contacts(s)."); - } + if ($sentFollowup) { + $mailStatus .= '
' . ts("A copy of the follow-up activity has also been sent to follow-up assignee contacts(s)."); + } } } diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php index 902e779868..a281d231ed 100644 --- a/CRM/Contact/Form/Task/EmailCommon.php +++ b/CRM/Contact/Form/Task/EmailCommon.php @@ -541,10 +541,10 @@ class CRM_Contact_Form_Task_EmailCommon { $mailToFollowupContacts[$values['email']] = $values; } - $sentFollowup = CRM_Activity_BAO_Activity::sendToAssignee($followupActivity, $mailToFollowupContacts); - if ($sentFollowup) { - $mailStatus .= '
' . ts("A copy of the follow-up activity has also been sent to follow-up assignee contacts(s)."); - } + $sentFollowup = CRM_Activity_BAO_Activity::sendToAssignee($followupActivity, $mailToFollowupContacts); + if ($sentFollowup) { + $mailStatus .= '
' . ts("A copy of the follow-up activity has also been sent to follow-up assignee contacts(s)."); + } } } } -- 2.25.1