Skip to content

Commit

Permalink
Fix merge hook arrays
Browse files Browse the repository at this point in the history
  • Loading branch information
seamuslee001 committed Oct 10, 2019
1 parent 32d2bb7 commit bbdc693
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CRM/Utils/Hook.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public function invoke(
}
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;
}
Expand Down

0 comments on commit bbdc693

Please sign in to comment.