projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge commonLetterCompose() and commonCompose()
[civicrm-core.git]
/
CRM
/
Contact
/
Form
/
Task
/
PDFLetterCommon.php
diff --git
a/CRM/Contact/Form/Task/PDFLetterCommon.php
b/CRM/Contact/Form/Task/PDFLetterCommon.php
index 9b0227607195f0bf1be9a6aede93d98e87053324..5fb7f55483529d53b1d3be1d4f528dcc7c2c6699 100644
(file)
--- a/
CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/
CRM/Contact/Form/Task/PDFLetterCommon.php
@@
-174,7
+174,7
@@
class CRM_Contact_Form_Task_PDFLetterCommon {
$form->assign('useSelectedPageFormat', ts('Should the new template always use the selected Page Format?'));
$form->assign('totalSelectedContacts', count($form->_contactIds));
$form->assign('useSelectedPageFormat', ts('Should the new template always use the selected Page Format?'));
$form->assign('totalSelectedContacts', count($form->_contactIds));
- CRM_Mailing_BAO_Mailing::common
Letter
Compose($form);
+ CRM_Mailing_BAO_Mailing::commonCompose($form);
$buttons = array();
if ($form->get('action') != CRM_Core_Action::VIEW) {
$buttons = array();
if ($form->get('action') != CRM_Core_Action::VIEW) {
@@
-395,6
+395,10
@@
class CRM_Contact_Form_Task_PDFLetterCommon {
}
if ($form->_cid) {
$activity = CRM_Activity_BAO_Activity::create($activityParams);
}
if ($form->_cid) {
$activity = CRM_Activity_BAO_Activity::create($activityParams);
+ if (!empty($form->_caseId)) {
+ $caseActivityParams = array('activity_id' => $activity->id, 'case_id' => $form->_caseId);
+ CRM_Case_BAO_Case::processCaseActivity($caseActivityParams);
+ }
}
else {
// create Print PDF activity for each selected contact. CRM-6886
}
else {
// create Print PDF activity for each selected contact. CRM-6886