[icinga-checkins] icinga.org: icingaweb2/feature/setup-wizard-7163: No longer make ICINGAWEB_APPDIR configureable

git at icinga.org git at icinga.org
Wed Nov 12 14:53:53 CET 2014


Module: icingaweb2
Branch: feature/setup-wizard-7163
Commit: 277765ac72dc5b8cbcbc08cee74fc2381ffd9fee
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=277765ac72dc5b8cbcbc08cee74fc2381ffd9fee

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Wed Nov 12 13:18:05 2014 +0100

No longer make ICINGAWEB_APPDIR configureable

---

 library/Icinga/Application/ApplicationBootstrap.php |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 08bab4a..0c37212 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -107,17 +107,7 @@ abstract class ApplicationBootstrap
             throw new LogicException('\'ICINGAWEB_BASEDIR\' is not defined');
         }
         define('ICINGAWEB_VENDORS', ICINGAWEB_BASEDIR . '/library/vendor');
-
-        if (defined('ICINGAWEB_APPDIR')) {
-            $this->appDir = ICINGAWEB_APPDIR;
-        } else {
-            if (array_key_exists('ICINGAWEB_APPDIR', $_SERVER)) {
-                $this->appDir = $_SERVER['ICINGAWEB_APPDIR'];
-            } else {
-                $this->appDir = ICINGAWEB_BASEDIR . '/application';
-            }
-            define('ICINGAWEB_APPDIR', $this->appDir);
-        }
+        define('ICINGAWEB_APPDIR', ICINGAWEB_BASEDIR . '/application');
 
         if ($configDir === null) {
             if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {



More information about the icinga-checkins mailing list