Merge pull request #19153 from civicrm/5.33

[civicrm-core.git] / CRM / Upgrade / DispatchPolicy.php

diff --git a/CRM/Upgrade/DispatchPolicy.php b/CRM/Upgrade/DispatchPolicy.php
index 9403bd253c1d4273e2143e7f5a6c565d50ab772b..a67c17e2aefe0e4d579619db4e54b86aa853a318 100644 (file)
--- a/CRM/Upgrade/DispatchPolicy.php
+++ b/CRM/Upgrade/DispatchPolicy.php
@@ -59,6 +59,10 @@ class CRM_Upgrade_DispatchPolicy {
     // It's more restrictive, preventing interference from unexpected callpaths.
     $policies['upgrade.main'] = [
       'hook_civicrm_config' => 'run',
+      'hook_civicrm_container' => 'run',
+      'hook_civicrm_alterSettingsFolders' => 'run',
+      'hook_civicrm_alterSettingsMetaData' => 'run',
+      'hook_civicrm_permission' => 'run',
       '/^hook_civicrm_(pre|post)$/' => 'drop',
       '/^hook_civicrm_/' => $strict ? 'warn-drop' : 'drop',
       '/^civi\./' => 'run',
@@ -89,8 +93,8 @@ class CRM_Upgrade_DispatchPolicy {
       '/./' => 'run',
     ];
 
-    return $policies['upgrade.old'];
-    // return $policies[$phase];
+    // return $policies['upgrade.old'];
+    return $policies[$phase];
   }
 
 }