Merge pull request #13010 from bancer/2.x-config

Use CONFIG constant
This commit is contained in:
Mark Story 2019-02-23 16:50:54 -09:00 committed by GitHub
commit d054d536ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -140,8 +140,11 @@ class ShellDispatcher {
define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'tmp' . DS); define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'tmp' . DS);
} }
if (!defined('CONFIG')) {
define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
}
// $boot is used by Cake/bootstrap.php file // $boot is used by Cake/bootstrap.php file
$boot = file_exists(ROOT . DS . APP_DIR . DS . 'Config' . DS . 'bootstrap.php'); $boot = file_exists(CONFIG . 'bootstrap.php');
require CORE_PATH . 'Cake' . DS . 'bootstrap.php'; require CORE_PATH . 'Cake' . DS . 'bootstrap.php';
if (!file_exists(CONFIG . 'core.php')) { if (!file_exists(CONFIG . 'core.php')) {