Fix merge hook arrays
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 10 Oct 2019 18:43:46 +0000 (05:43 +1100)
committerSeamus Lee <seamuslee001@gmail.com>
Thu, 10 Oct 2019 18:43:46 +0000 (05:43 +1100)
CRM/Utils/Hook.php

index 743a0c4d83cd0639e3e7d2eeb5eff5c10b058597..3993c4349ae8b1da642b6be076f1bd695ae4002c 100644 (file)
@@ -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;
       }