Conditionally define constants in the CLI environment.

Only define constants if they don't already exist. Users can modify `app/Console/cake.php` and define constants before this code executes. Fixes #4000
cakephp · Aug 19, 2013 · f7a81a9 · f7a81a9
1 parent 675f828
commit f7a81a9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
@@ -119,9 +119,15 @@ protected function _initEnvironment() {
  * @return boolean Success.
  */
 	protected function _bootstrap() {
-		define('ROOT', $this->params['root']);
-		define('APP_DIR', $this->params['app']);
-		define('APP', $this->params['working'] . DS);
+		if (!defined('ROOT')) {
+			define('ROOT', $this->params['root']);
+		}
+		if (!defined('APP_DIR')) {
+			define('APP_DIR', $this->params['app']);
+		}
+		if (!defined('APP')) {
+			define('APP', $this->params['working'] . DS);
+		}
 		if (!defined('WWW_ROOT')) {
 			define('WWW_ROOT', APP . $this->params['webroot'] . DS);
 		}