From 9c103a9864d9a5a66331b7c550112b34be0f6cde Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 13 Nov 2014 09:24:21 +0100
Subject: [PATCH] Remove constant ICINGAWEB_BASEDIR
We should avoid use of constants.
---
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 13a36d185..4d0f17f31 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -117,11 +117,9 @@ abstract class ApplicationBootstrap
$baseDir = dirname($this->getBootstrapDirectory());
}
$this->baseDir = $baseDir;
- if (! defined('ICINGAWEB_BASEDIR')) {
- define('ICINGAWEB_BASEDIR', dirname($this->getBootstrapDirectory()));
- }
- define('ICINGAWEB_VENDORS', ICINGAWEB_BASEDIR . '/library/vendor');
- define('ICINGAWEB_APPDIR', ICINGAWEB_BASEDIR . '/application');
+
+ define('ICINGAWEB_VENDORS', $baseDir . '/library/vendor');
+ define('ICINGAWEB_APPDIR', $baseDir . '/application');
$this->appDir = ICINGAWEB_APPDIR;
$this->libDir = realpath(__DIR__ . '/../..');