Merge pull request #14667 from hoegrammer/master

[civicrm-core.git] / CRM / Core / ManagedEntities.php

diff --git a/CRM/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php
index a3883286963a35fd7e1eef88b2c2655905ab25e3..cf47fa6918bd14986f4c4e656c8ea927c5903ce5 100644 (file)
--- a/CRM/Core/ManagedEntities.php
+++ b/CRM/Core/ManagedEntities.php
@@ -112,10 +112,15 @@ class CRM_Core_ManagedEntities {
   /**
    * Identify any enabled/disabled modules. Add new entities, update
    * existing entities, and remove orphaned (stale) entities.
+   * @param bool $ignoreUpgradeMode
    *
    * @throws Exception
    */
-  public function reconcile() {
+  public function reconcile($ignoreUpgradeMode = FALSE) {
+    // Do not reconcile whilst we are in upgrade mode
+    if (CRM_Core_Config::singleton()->isUpgradeMode() && !$ignoreUpgradeMode) {
+      return;
+    }
     if ($error = $this->validate($this->getDeclarations())) {
       throw new Exception($error);
     }