projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc57fc7)
Issue 4879
authorStephen Palmstrom <stephen.palmstrom@missionassist.org.uk>
Tue, 2 Jan 2024 14:53:46 +0000 (14:53 +0000)
committerStephen Palmstrom <stephen.palmstrom@missionassist.org.uk>
Tue, 2 Jan 2024 14:53:46 +0000 (14:53 +0000)
CRM/Import/Parser.php patch | blob | blame | history
CRM/Mailing/Event/BAO/MailingEventForward.php patch | blob | blame | history

diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
index 5af9f8688e57d17a1f8a98f49280b1d57dc5c007..72031a014c9025425e12a682b967b58d56af6984 100644 (file)
--- a/CRM/Import/Parser.php
+++ b/CRM/Import/Parser.php
@@ -1128,7 +1128,7 @@ abstract class CRM_Import_Parser implements UserJobInterface {
 
     // get the formatted location blocks into params - w/ 3.0 format, CRM-4605
     if (!empty($values['location_type_id'])) {
-      static $fields = NULL;
+      $fields = NULL;
       if ($fields == NULL) {
         $fields = [];
       }
diff --git a/CRM/Mailing/Event/BAO/MailingEventForward.php b/CRM/Mailing/Event/BAO/MailingEventForward.php
index ad4fd2bcd2115b1a81c6ac0b048766efa31f7f78..6793c2f289c9605601f91dc2f6b8db422c781ecb 100644 (file)
--- a/CRM/Mailing/Event/BAO/MailingEventForward.php
+++ b/CRM/Mailing/Event/BAO/MailingEventForward.php
@@ -233,7 +233,7 @@ class CRM_Mailing_Event_BAO_MailingEventForward extends CRM_Mailing_Event_DAO_Ma
 
     // get the formatted location blocks into params - w/ 3.0 format, CRM-4605
     if (!empty($values['location_type_id'])) {
-      static $fields = NULL;
+      $fields = NULL;
       if ($fields == NULL) {
         $fields = [];
       }