From 221b40dfbae49adb552bc1f243921543ad5ad27f Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 3 Mar 2022 16:29:34 -0800 Subject: [PATCH] ManagedEntities - Ignore `$ignoreUpgradeMode` This guard was added by 912511a359680eb72b15c595b5091fa03f8687f2 as part of a previous approach to managing hooks during upgrades. This general approach changed with https://github.com/civicrm/civicrm-core/pull/17126; so 17126 partially undid this... but it inadvertently had the effect of completely disabling `reconcile()` (because this guard was left). --- CRM/Core/ManagedEntities.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php index eeb78f947d..d94d89e22f 100644 --- a/CRM/Core/ManagedEntities.php +++ b/CRM/Core/ManagedEntities.php @@ -116,14 +116,10 @@ class CRM_Core_ManagedEntities { * existing entities, and remove orphaned (stale) entities. * * @param bool $ignoreUpgradeMode - * + * Unused. * @throws \CRM_Core_Exception */ public function reconcile($ignoreUpgradeMode = FALSE) { - // Do not reconcile whilst we are in upgrade mode - if (CRM_Core_Config::singleton()->isUpgradeMode() && !$ignoreUpgradeMode) { - return; - } $this->loadDeclarations(); if ($error = $this->validate($this->getDeclarations())) { throw new CRM_Core_Exception($error); -- 2.25.1