From d456f832485a6330c4ec027482ffd3e7af152764 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 2 Apr 2023 15:19:23 +1200 Subject: [PATCH] Move entity_id before status_message --- ext/civiimport/Civi/Api4/Import/CheckAccessAction.php | 2 -- ext/civiimport/Managed/ImportSearches.mgd.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/civiimport/Civi/Api4/Import/CheckAccessAction.php b/ext/civiimport/Civi/Api4/Import/CheckAccessAction.php index 04d01020e5..d18125af42 100644 --- 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 ae72e8a3d3..845b2add89 100644 --- 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; -- 2.25.1