tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use getenv() instead of $_SERVER to get ICINGAWEB_CONFIGDIR 

refs #10488
This commit is contained in:
Alexander A. Klimov 2015-12-18 13:26:38 +01:00
parent 643ee7b108
commit 414a78d532
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -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';