projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32d2bb7
)
Fix merge hook arrays
author
Seamus Lee
<seamuslee001@gmail.com>
Thu, 10 Oct 2019 18:43:46 +0000
(
05:43
+1100)
committer
Seamus Lee
<seamuslee001@gmail.com>
Thu, 10 Oct 2019 18:43:46 +0000
(
05:43
+1100)
CRM/Utils/Hook.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/Hook.php
b/CRM/Utils/Hook.php
index 743a0c4d83cd0639e3e7d2eeb5eff5c10b058597..3993c4349ae8b1da642b6be076f1bd695ae4002c 100644
(file)
--- a/
CRM/Utils/Hook.php
+++ b/
CRM/Utils/Hook.php
@@
-189,7
+189,7
@@
abstract class CRM_Utils_Hook {
}
else {
// We need to ensure tht we will still run known bootstrap related hooks even if the container is not booted.
- $prebootContainerHooks =
$upgradeFriendlyHooks + ['civicrm_entityTypes', 'civicrm_config']
;
+ $prebootContainerHooks =
array_merge($upgradeFriendlyHooks, ['civicrm_entityTypes', 'civicrm_config'])
;
if (!\Civi\Core\Container::isContainerBooted() && !in_array($fnSuffix, $prebootContainerHooks)) {
return;
}