diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2017-02-26 10:30:16 +0100 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2017-02-26 10:30:16 +0100 |
| commit | 69f7eb115a0a48d4d2808708bcfef9eaf292f64c (patch) | |
| tree | e8e4ac633b88099b6836ba3f637b0ab2b1d6a472 /web/lib/confparser.inc.php | |
| parent | fdd932ff8d5e5899cfeae9a8b29011fa2cf9d439 (diff) | |
| parent | 5fd417d70154470d145c83a4b60693c8d877b016 (diff) | |
| download | aur-69f7eb115a0a48d4d2808708bcfef9eaf292f64c.tar.gz aur-69f7eb115a0a48d4d2808708bcfef9eaf292f64c.tar.xz | |
Merge branch 'master' into maint
Diffstat (limited to 'web/lib/confparser.inc.php')
| -rw-r--r-- | web/lib/confparser.inc.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 789300e1..e7128be6 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -4,7 +4,11 @@ function config_load() { global $AUR_CONFIG; if (!isset($AUR_CONFIG)) { - $AUR_CONFIG = parse_ini_file("/etc/aurweb/config", true, INI_SCANNER_RAW); + $path = getenv('AUR_CONFIG'); + if (!$path) { + $path = "/etc/aurweb/config"; + } + $AUR_CONFIG = parse_ini_file($path, true, INI_SCANNER_RAW); } } |