[PATCH 1/2] confparser.inc.php: Add missing semicolon
Fixes a regression introduced in 97c5bce (config: allow reading both the defaults file and the modified config, 2018-04-15). Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org> --- web/lib/confparser.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 29f17e8..cb51e02 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -22,7 +22,7 @@ function config_load() { } else { die("aurweb config file not found"); } - $AUR_CONFIG = array_replace_recursive($default_config, $config) + $AUR_CONFIG = array_replace_recursive($default_config, $config); } } -- 2.17.0
Fixes a regression introduced in 97c5bce (config: allow reading both the defaults file and the modified config, 2018-04-15). Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org> --- web/lib/confparser.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index cb51e02..1152e13 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -10,7 +10,7 @@ function config_load() { } $defaults_path = getenv('AUR_CONFIG_DEFAULTS'); if (!$defaults_path) { - $defaults_path = path . ".defaults"; + $defaults_path = $path . ".defaults"; } if (file_exists($defaults_path)) { $default_config = parse_ini_file($defaults_path, true, INI_SCANNER_RAW); -- 2.17.0
participants (1)
-
Lukas Fleischer