smarty/php notices

diff --git a/CRM/Contribute/Form/ContributionView.php b/CRM/Contribute/Form/ContributionView.php
index 69022ec099796c0e21f2205f3c91b26372f28466..da929d3a07be7390f6af583b5e118ae60f637093 100644 (file)
--- a/CRM/Contribute/Form/ContributionView.php
+++ b/CRM/Contribute/Form/ContributionView.php
@@ -50,6 +50,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
     $this->addExpectedSmartyVariables([
       'pricesetFieldsCount',
       'pcp_id',
+      'getTaxDetails',
       // currencySymbol maybe doesn't make sense but is probably old?
       'currencySymbol',
     ]);
@@ -153,6 +154,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
     $values['note'] = array_values($noteValue);
 
     // show billing address location details, if exists
+    $values['billing_address'] = '';
     if (!empty($values['address_id'])) {
       $addressParams = ['id' => $values['address_id']];
       $addressDetails = CRM_Core_BAO_Address::getValues($addressParams, FALSE, 'id');

diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index c00e866270eda0c0f01bb3146d9e2276277249c1..184ce1e6ed02aa61cb0e55e30591593909112c8d 100644 (file)
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -1975,6 +1975,11 @@ SELECT IF( EXISTS(SELECT name FROM civicrm_contact_type WHERE name like %1), 1,
       }
     }
     else {
+      $form->addExpectedSmartyVariables([
+        'multiRecordDisplay',
+        'groupId',
+        'skipTitle',
+      ]);
       $form->assign_by_ref("{$prefix}viewCustomData", $details);
       return $details;
     }