Re-adding support for PHP's include_path.

Moving constants that are made of other constants into bootstrap.php
This commit is contained in:
Mark Story 2011-07-28 13:44:07 -04:00 committed by mark_story
parent e083b21dfe
commit 721c438817
7 changed files with 113 additions and 46 deletions

View file

@ -23,18 +23,21 @@ if (!defined('E_DEPRECATED')) {
}
error_reporting(E_ALL & ~E_DEPRECATED);
/**
* If the index.php file is used instead of an .htaccess file
* or if the user can not set the web root to use the public
* directory we will define ROOT there, otherwise we set it
* here.
*/
if (!defined('ROOT')) {
define('ROOT', '../');
}
if (!defined('WEBROOT_DIR')) {
define('WEBROOT_DIR', 'webroot');
}
if (!defined('CAKE_CORE_INCLUDE_PATH')) {
define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(__FILE__)));
}
if (!defined('CORE_PATH')) {
define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
}
if (!defined('APP_PATH')) {
define('APP_PATH', ROOT . DS . APP_DIR . DS);
}
if (!defined('WEBROOT_DIR')) {
define('WEBROOT_DIR', 'webroot');
}
/**
* Path to the cake directory.