Ensure no hard fail if field not defined #66

eileenmcnaughton · Sep 25, 2023 · 01c3c5a · 01c3c5a
1 parent 004283f
commit 01c3c5a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CRM/Csvimport/Import/Parser/Api.php b/CRM/Csvimport/Import/Parser/Api.php
@@ -126,14 +126,14 @@ protected function getReferenceFields(): array {
 
             if (count($fieldsInUniqueIndex) === 1) {
               $indexFieldName = $fieldsInUniqueIndex[0];
-              
+
               // skip special case fields (such as the address.external_identifier)
               if (empty($entityFieldMetadata[$indexFieldName])) {
                 continue;
               }
-              
+
               $indexFieldMetadata = array_merge(
-                $entityFieldMetadata[$indexFieldName], [
+                (array) $entityFieldMetadata[$indexFieldName], [
                   'referenced_field' => $referenceField,
                   'entity_name' => $entityName,
                   'entity_field_name' => $indexFieldName,

diff --git a/csvimport.civix.php b/csvimport.civix.php
@@ -133,8 +133,8 @@ function _csvimport_civix_insert_navigation_menu(&$menu, $path, $item) {
   if (empty($path)) {
     $menu[] = [
       'attributes' => array_merge([
-        'label'      => CRM_Utils_Array::value('name', $item),
-        'active'     => 1,
+        'label' => $item['name'] ?? NULL,
+        'active' => 1,
       ], $item),
     ];
     return TRUE;

diff --git a/info.xml b/info.xml
@@ -28,7 +28,7 @@
   </classloader>
   <civix>
     <namespace>CRM/Csvimport</namespace>
-    <format>23.02.0</format>
+    <format>23.02.1</format>
   </civix>
   <mixins>
     <mixin>menu-xml@1.0.0</mixin>