Move entity_id before status_message

diff --git a/ext/civiimport/Civi/Api4/Import/CheckAccessAction.php b/ext/civiimport/Civi/Api4/Import/CheckAccessAction.php
index 04d01020e54d1857149366707182430a04af7042..d18125af42e9091d73e1040109233a4c6e5823ad 100644 (file)
--- a/ext/civiimport/Civi/Api4/Import/CheckAccessAction.php
+++ b/ext/civiimport/Civi/Api4/Import/CheckAccessAction.php
@@ -12,8 +12,6 @@
 
 namespace Civi\Api4\Import;
 
-use Civi\API\Exception\UnauthorizedException;
-use Civi\API\Request;
 use Civi\Api4\Generic\AbstractAction;
 use Civi\Api4\Generic\Result;
 use Civi\Api4\Generic\Traits\GetSetValueTrait;

diff --git a/ext/civiimport/Managed/ImportSearches.mgd.php b/ext/civiimport/Managed/ImportSearches.mgd.php
index ae72e8a3d31113b4093b0afe743da1fc84ebc674..845b2add890382eff6c488024430c445d46b4cea 100644 (file)
--- a/ext/civiimport/Managed/ImportSearches.mgd.php
+++ b/ext/civiimport/Managed/ImportSearches.mgd.php
@@ -7,7 +7,7 @@ $managedEntities = [];
 $importEntities = Import::getImportTables();
 foreach ($importEntities as $importEntity) {
   try {
-    $fields = array_merge(['_id' => TRUE, '_status' => TRUE, '_status_message' => TRUE, '_entity_id' => TRUE], Import::getFieldsForUserJobID($importEntity['user_job_id'], FALSE));
+    $fields = array_merge(['_id' => TRUE, '_status' => TRUE, '_entity_id' => TRUE, '_status_message' => TRUE], Import::getFieldsForUserJobID($importEntity['user_job_id'], FALSE));
   }
   catch (CRM_Core_Exception $e) {
     continue;