mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-02-24 18:48:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reverse arguments to array_merge of cusotm config (#8033)

Browse Source 
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
This commit is contained in:
Lars Kellogg-Stedman
2025-09-29 11:04:45 -04:00
committed by GitHub
parent 5e413ef0ce
commit 0d463b67bd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/do-install.php
View File

@@ -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);
}
}