From be6c23735f6b102154007d2be07802e9f32b7896 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 25 Nov 2021 20:41:45 +1300 Subject: [PATCH] Ensure CMSPrint variables are assigned to the template --- CRM/Core/Form.php | 2 ++ CRM/Core/Page.php | 7 +++++-- templates/CRM/common/CMSPrint.tpl | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php index 1143be4580..c3db10f33b 100644 --- a/CRM/Core/Form.php +++ b/CRM/Core/Form.php @@ -265,6 +265,8 @@ class CRM_Core_Form extends HTML_QuickForm_Page { // in CMSPrint.tpl 'breadcrumb', 'pageTitle', + 'urlIsPublic', + 'isDeleted', // in 'body.tpl 'suppressForm', 'beginHookFormElements', diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php index 17b534e52a..99742ac99c 100644 --- a/CRM/Core/Page.php +++ b/CRM/Core/Page.php @@ -106,8 +106,6 @@ class CRM_Core_Page { * @var string[] */ public $expectedSmartyVariables = [ - 'breadcrumb', - 'pageTitle', 'isForm', 'hookContent', 'hookContentPlacement', @@ -121,6 +119,11 @@ class CRM_Core_Page { // required for Summary.tpl (contact summary) but seems // likely to be used more broadly to warrant inclusion here. 'context', + // for CMSPrint.tpl + 'urlIsPublic', + 'breadcrumb', + 'pageTitle', + 'isDeleted', ]; /** diff --git a/templates/CRM/common/CMSPrint.tpl b/templates/CRM/common/CMSPrint.tpl index fb4beb1ce3..c0579b38aa 100644 --- a/templates/CRM/common/CMSPrint.tpl +++ b/templates/CRM/common/CMSPrint.tpl @@ -11,7 +11,7 @@ {include file="CRM/common/debug.tpl"} {/if} -
+
{if $breadcrumb} {crmRegion name='page-footer'} -{if !empty($urlIsPublic)} +{if $urlIsPublic} {include file="CRM/common/publicFooter.tpl"} {else} {include file="CRM/common/footer.tpl"} -- 2.25.1