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

Remove constant ICINGAWEB_BASEDIR 

We should avoid use of constants.
This commit is contained in:
Eric Lippmann 2014-11-13 09:24:21 +01:00
parent 79bd743900
commit 9c103a9864
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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__ . '/../..');