From fac886ce719a94733981cfaf8db5cc03b0533f3a Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 8 Nov 2021 11:34:14 +1300
Subject: [PATCH] Ensure hookContentPlacement is assigned

---
 CRM/Core/Page.php                               | 2 +-
 templates/CRM/Contact/Page/View/Summary-tab.tpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php
index 08b614e651..46ced4b0bd 100644
--- a/CRM/Core/Page.php
+++ b/CRM/Core/Page.php
@@ -105,7 +105,7 @@ class CRM_Core_Page {
    *
    * @var string[]
    */
-  public $expectedSmartyVariables = ['breadcrumb', 'pageTitle', 'isForm', 'hookContent'];
+  public $expectedSmartyVariables = ['breadcrumb', 'pageTitle', 'isForm', 'hookContent', 'hookContentPlacement'];
 
   /**
    * Class constructor.
diff --git a/templates/CRM/Contact/Page/View/Summary-tab.tpl b/templates/CRM/Contact/Page/View/Summary-tab.tpl
index 67cf851f3e..60af440b0a 100644
--- a/templates/CRM/Contact/Page/View/Summary-tab.tpl
+++ b/templates/CRM/Contact/Page/View/Summary-tab.tpl
@@ -9,9 +9,9 @@
 *}
 {* Summary tab from Contact Summary screen *}
 
-{if (isset($hookContentPlacement) and ($hookContentPlacement neq 3)) or empty($hookContentPlacement)}
+{if $hookContentPlacement !== 3}
 
-  {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 2}
+  {if $hookContent && $hookContentPlacement eq 2}
     {include file="CRM/Contact/Page/View/SummaryHook.tpl"}
   {/if}
 
@@ -148,7 +148,7 @@
     </div>
   {/if}
 
-  {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 1}
+  {if $hookContent && $hookContentPlacement eq 1}
     {include file="CRM/Contact/Page/View/SummaryHook.tpl"}
   {/if}
 {else}
-- 
2.25.1