diff options
| author |  Lars Kellogg-Stedman <lars@oddbit.com>
| 2025-09-29 11:04:45 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-09-29 17:04:45 +0200 |
| commit | 0d463b67bdade2e896b7fa74595950eeaadd55fe (patch) | |
| tree | 4db38f7509e730be809309e97cf57e1a8200779a /cli | |
| parent | 5e413ef0cea1bc85c80a6183d09d35658f1ecdc7 (diff) | |
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
Diffstat (limited to 'cli')
| -rwxr-xr-x | cli/do-install.php | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |