Merge pull request #15482 from seamuslee001/fix_merge_array

Fixes an issue where the two arrays weren't always being merged correctly
civicrm · Oct 10, 2019 · 61dbc8d · 61dbc8d
2 parents 32d2bb7 + bbdc693
commit 61dbc8d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php
@@ -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;
       }