Merge pull request #27998 from totten/5.67-config-arraynull

PHP 8.x: fix TypeError in config hook
civicrm · Nov 2, 2023 · 8a0d3b8 · 8a0d3b8
2 parents f250b66 + daa924f
commit 8a0d3b8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php
@@ -1484,7 +1484,7 @@ public static function config(&$config, ?array $flags = NULL) {
       $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,