Ensure CMSPrint variables are assigned to the template

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 1143be45804427bb63b8041a3aba7580b20551f1..c3db10f33b66fa5206f5cd7ed80b4ed92f657f1f 100644 (file)
--- 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 17b534e52a0c8e2563aed7afddb0ee4aa5b96d67..99742ac99ca04821a3c156a9cebe8512aa744363 100644 (file)
--- 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 fb4beb1ce32ddb42614934ce44d86028de6a2aa9..c0579b38aa665cca10aea202782f885c9039f51a 100644 (file)
--- a/templates/CRM/common/CMSPrint.tpl
+++ b/templates/CRM/common/CMSPrint.tpl
@@ -11,7 +11,7 @@
 {include file="CRM/common/debug.tpl"}
 {/if}
 
-<div id="crm-container" class="crm-container{if !empty($urlIsPublic)} crm-public{/if}" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
+<div id="crm-container" class="crm-container{if $urlIsPublic} crm-public{/if}" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
 
 {if $breadcrumb}
   <div class="breadcrumb">
@@ -26,7 +26,7 @@
 
 {if $pageTitle}
   <div class="crm-title">
-    <h1 class="title">{if !empty($isDeleted)}<del>{/if}{$pageTitle}{if !empty($isDeleted)}</del>{/if}</h1>
+    <h1 class="title">{if $isDeleted}<del>{/if}{$pageTitle}{if $isDeleted}</del>{/if}</h1>
   </div>
 {/if}
 
@@ -46,7 +46,7 @@
 </div>
 
 {crmRegion name='page-footer'}
-{if !empty($urlIsPublic)}
+{if $urlIsPublic}
   {include file="CRM/common/publicFooter.tpl"}
 {else}
   {include file="CRM/common/footer.tpl"}