From 308ab5d7fba8efb603c245a2dfb4c7f915584107 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 1 Nov 2021 10:32:18 +1300
Subject: [PATCH] Ensure more common variables are set

---
 CRM/Core/Form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index b04744fded63..74a64a300264 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -297,6 +297,7 @@ public function __construct(
     // let the constructor initialize this, should happen only once
     if (!isset(self::$_template)) {
       self::$_template = CRM_Core_Smarty::singleton();
+      self::$_template->ensureVariablesAreAssigned(['breadcrumb', 'pageTitle', 'suppressForm', 'beginHookFormElements', 'linkButtons', 'contactId']);
     }
     // Workaround for CRM-15153 - give each form a reasonably unique css class
     $this->addClass(CRM_Utils_System::getClassName($this));