From: Tim Otten <totten@civicrm.org>
Date: Sat, 12 Dec 2020 05:08:20 +0000 (-0800)
Subject: Partial revert "dev/core#2232 Permit hook_civicrm_container and some other prebootish... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dc28603c1eb882f2ac2fa197fd2ef667cc7175f1;p=civicrm-core.git

Partial revert "dev/core#2232 Permit hook_civicrm_container and some other prebootish hooks to run during upgrade and clear out the asset builder cache post upgrade"

This reverts commit 756d9e0dbbe4ff66d2568f02a8ee1f152bd9c5e5.
---

diff --git a/CRM/Upgrade/DispatchPolicy.php b/CRM/Upgrade/DispatchPolicy.php
index a67c17e2ae..de0fa72511 100644
--- a/CRM/Upgrade/DispatchPolicy.php
+++ b/CRM/Upgrade/DispatchPolicy.php
@@ -59,10 +59,6 @@ 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',