From 0d463b67bdade2e896b7fa74595950eeaadd55fe Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Mon, 29 Sep 2025 11:04:45 -0400 Subject: Reverse arguments to array_merge of cusotm config (#8033) The installer was merging the initial configuration into the custom configuration, which meant that any keys set in the system configuration would take precedence over custom configuration. Practically, this meant it was not possible to preconfigure the database connection via `config.custom.php`. This commit reverses the order of the arguments to the `array_merge` function so that keys in the custom configuration will override keys in the initial configuration. See also: https://github.com/FreshRSS/FreshRSS/discussions/8030 --- cli/do-install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cli') diff --git a/cli/do-install.php b/cli/do-install.php index 57a5121d4..f0dedc88e 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -101,7 +101,7 @@ $customConfigPath = DATA_PATH . '/config.custom.php'; if (file_exists($customConfigPath)) { $customConfig = include $customConfigPath; if (is_array($customConfig) && is_array_keys_string($customConfig)) { - $config = array_merge($customConfig, $config); + $config = array_merge($config, $customConfig); } } -- cgit v1.2.3