Merge pull request #11186 from totten/master-civicase-pdf

CRM-21255 - PDFLetterCommon - Detect buttons in new popup style
civicrm · Oct 27, 2017 · b30f833 · b30f833
2 parents 50fc005 + 592172f
commit b30f833
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/CRM/Contact/Form/Task/PDFLetterCommon.php b/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -363,8 +363,12 @@ public static function postProcess(&$form) {
     $skipDeceased = isset($form->skipDeceased) ? $form->skipDeceased : TRUE;
     $html = $activityIds = array();
 
+    // CRM-21255 - Hrm, CiviCase 4+5 seem to report buttons differently...
+    $c = $form->controller->container();
+    $isLiveMode = ($buttonName == '_qf_PDF_upload') || isset($c['values']['PDF']['buttons']['_qf_PDF_upload']);
+
     // CRM-16725 Skip creation of activities if user is previewing their PDF letter(s)
-    if ($buttonName == '_qf_PDF_upload') {
+    if ($isLiveMode) {
 
       // This seems silly, but the old behavior was to first check `_cid`
       // and then use the provided `$contactIds`. Probably not even necessary,
@@ -418,7 +422,7 @@ public static function postProcess(&$form) {
     }
 
     $tee = NULL;
-    if (Civi::settings()->get('recordGeneratedLetters') === 'combined-attached') {
+    if ($isLiveMode && Civi::settings()->get('recordGeneratedLetters') === 'combined-attached') {
       if (count($activityIds) !== 1) {
         throw new CRM_Core_Exception("When recordGeneratedLetters=combined-attached, there should only be one activity.");
       }