From 20fd5c17c4fda9e8fdd0fa0c1f909bb577a92f14 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 30 Sep 2021 00:51:06 +1300
Subject: [PATCH] User getSubmittedValue rather than passed values

---
 CRM/Contact/Form/Task/PDFTrait.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Contact/Form/Task/PDFTrait.php b/CRM/Contact/Form/Task/PDFTrait.php
index b12d51ebc1..8c564649fc 100644
--- a/CRM/Contact/Form/Task/PDFTrait.php
+++ b/CRM/Contact/Form/Task/PDFTrait.php
@@ -414,7 +414,7 @@ trait CRM_Contact_Form_Task_PDFTrait {
     $html_message = $formValues['html_message'] ?? NULL;
 
     // process message template
-    if (!empty($formValues['saveTemplate']) || !empty($formValues['updateTemplate'])) {
+    if (!empty($this->getSubmittedValue('saveTemplate')) || !empty($formValues['updateTemplate'])) {
       $messageTemplate = [
         'msg_text' => NULL,
         'msg_html' => $formValues['html_message'],
@@ -426,8 +426,8 @@ trait CRM_Contact_Form_Task_PDFTrait {
       if (!empty($formValues['bind_format']) && $formValues['format_id']) {
         $messageTemplate['pdf_format_id'] = $formValues['format_id'];
       }
-      if (!empty($formValues['saveTemplate'])) {
-        $messageTemplate['msg_title'] = $formValues['saveTemplateName'];
+      if ($this->getSubmittedValue('saveTemplate')) {
+        $messageTemplate['msg_title'] = $this->getSubmittedValue('saveTemplateName');
         CRM_Core_BAO_MessageTemplate::add($messageTemplate);
       }
 
-- 
2.25.1