From e479ff9b7c8b0dd402a8824e6cdf3a3e6310f195 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 3 Oct 2023 10:55:00 +1300
Subject: [PATCH] Smarty notice fix

---
 CRM/Contribute/Page/Tab.php                    | 4 ++--
 templates/CRM/Contribute/Form/Contribution.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Contribute/Page/Tab.php b/CRM/Contribute/Page/Tab.php
index 641bb6ee4f..b9ed69a9ba 100644
--- a/CRM/Contribute/Page/Tab.php
+++ b/CRM/Contribute/Page/Tab.php
@@ -428,7 +428,7 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
     $this->_action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 'browse');
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
 
-    if ($context == 'standalone') {
+    if ($context === 'standalone') {
       $this->_action = CRM_Core_Action::ADD;
     }
     else {
@@ -439,11 +439,11 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
           'return' => 'contact_id',
         ]);
       }
-      $this->assign('contactId', $this->_contactId);
 
       // check logged in url permission
       CRM_Contact_Page_View::checkUserPermission($this);
     }
+    $this->assign('contactId', $this->_contactId);
     $this->assign('action', $this->_action);
 
     if ($this->_permission == CRM_Core_Permission::EDIT && !CRM_Core_Permission::check('edit contributions')) {
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 1ebc799eec..0e6c1cabc3 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -316,7 +316,7 @@
     <!-- end of PCP -->
 
     {if !$payNow}
-      {include file="CRM/common/customDataBlock.tpl"}
+      {include file="CRM/common/customDataBlock.tpl" cid=$contactId}
     {/if}
 
     {literal}
-- 
2.25.1