From 7ea6eeb20de335fa6f035405356f1d82795be66b Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 12 Jun 2015 13:29:36 +0200 Subject: [PATCH] Revert "Don't use /etc/icingaweb2 as config path on Windows" This reverts commit 48870bb7e2ed392a6898591b20eace0c96f54993. --- library/Icinga/Application/ApplicationBootstrap.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 53c2c70c7..e265b91ee 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -134,20 +134,18 @@ abstract class ApplicationBootstrap $this->vendorDir = $baseDir . '/library/vendor'; $this->libDir = realpath(__DIR__ . '/../..'); - $this->setupAutoloader(); - if ($configDir === null) { if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) { $configDir = $_SERVER['ICINGAWEB_CONFIGDIR']; } else { - $configDir = Platform::isWindows() - ? $baseDir . DIRECTORY_SEPARATOR . 'config' - : '/etc/icingaweb2'; + $configDir = '/etc/icingaweb2'; } } $canonical = realpath($configDir); $this->configDir = $canonical ? $canonical : $configDir; + $this->setupAutoloader(); + set_include_path( implode( PATH_SEPARATOR,