From 896847a49bef87a771b568bbd4818a4d31b6160f Mon Sep 17 00:00:00 2001 From: colemanw Date: Thu, 27 Jul 2023 18:10:32 -0400 Subject: [PATCH] Managed - skip errors in install as well as upgrade mode Followup from https://github.com/civicrm/civicrm-core/pull/26891 to exclude install as well as upgrade mode. --- CRM/Core/ManagedEntities.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php index 7969ee036e..52e8d1c0c4 100644 --- a/CRM/Core/ManagedEntities.php +++ b/CRM/Core/ManagedEntities.php @@ -482,9 +482,9 @@ class CRM_Core_ManagedEntities { * @param Throwable|null $exception */ protected function onApiError(string $moduleName, string $managedEntityName, string $actionName, string $errorMessage, ?Throwable $exception = NULL): void { - // During upgrade this problem might be due to an about-to-be-installed extension + // During install/upgrade this problem might be due to an about-to-be-installed extension // So only log the error if it persists outside of upgrade mode - if (CRM_Core_Config::isUpgradeMode()) { + if (CRM_Core_Config::isUpgradeMode() || defined('CIVI_SETUP')) { return; } -- 2.25.1