PHP 8.x: fix TypeError in config hook

diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php
index e96b976ce4f467e71d8f7fb052302921053fabda..00e82f3602f75551e9662391e5570ac2cd4c2c21 100644 (file)
--- a/CRM/Utils/Hook.php
+++ b/CRM/Utils/Hook.php
@@ -1487,7 +1487,7 @@ abstract class CRM_Utils_Hook {
       $count++;
     }
     $defaultFlags = ['civicrm' => FALSE, 'uf' => FALSE, 'instances' => $count];
-    $flags = array_merge($defaultFlags, $flags);
+    $flags = !empty($flags) ? array_merge($defaultFlags, $flags) : $defaultFlags;
     $null = NULL;
     return self::singleton()->invoke(['config', 'flags'], $config,
       $flags, $null, $null, $null, $null,