From 414a78d53273c831b58e272639ad31d749d84969 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 18 Dec 2015 13:26:38 +0100 Subject: [PATCH] Use getenv() instead of $_SERVER to get ICINGAWEB_CONFIGDIR refs #10488 --- library/Icinga/Application/ApplicationBootstrap.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index d19e6cde3..2df4e83e3 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -138,9 +138,8 @@ abstract class ApplicationBootstrap $this->setupAutoloader(); if ($configDir === null) { - if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) { - $configDir = $_SERVER['ICINGAWEB_CONFIGDIR']; - } else { + $configDir = getenv('ICINGAWEB_CONFIGDIR'); + if ($configDir === false) { $configDir = Platform::isWindows() ? $baseDir . '/config' : '/etc/icingaweb2';