Browse Source

Allow setting path constants in app/Console/cake.php as you can in webroot/index.php

ADmad 12 years ago
parent
commit
8150b89aba
1 changed files with 4 additions and 2 deletions
  1. 4 2
      lib/Cake/Console/ShellDispatcher.php

+ 4 - 2
lib/Cake/Console/ShellDispatcher.php

@@ -122,8 +122,10 @@ class ShellDispatcher {
 		define('ROOT', $this->params['root']);
 		define('APP_DIR', $this->params['app']);
 		define('APP', $this->params['working'] . DS);
-		define('WWW_ROOT', APP . $this->params['webroot'] . DS);
-		if (!is_dir(ROOT . DS . APP_DIR . DS . 'tmp')) {
+		if (!defined('WWW_ROOT')) {
+			define('WWW_ROOT', APP . $this->params['webroot'] . DS);
+		}
+		if (!defined('TMP') && !is_dir(APP . 'tmp')) {
 			define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'tmp' . DS);
 		}
 		$boot = file_exists(ROOT . DS . APP_DIR . DS . 'Config' . DS . 'bootstrap.php');