From 6e2870c706efe970fae9f239619beededfb39aec Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sun, 31 Jul 2011 14:49:33 -0400
Subject: [PATCH] Removing APP_PATH it is always the same as APP. Fixing a typo
 in index.php.

---
 index.php                                     | 6 ------
 lib/Cake/Console/Command/CommandListShell.php | 2 +-
 lib/Cake/Console/Command/Task/ProjectTask.php | 2 +-
 lib/Cake/Console/Shell.php                    | 2 +-
 lib/Cake/Console/ShellDispatcher.php          | 6 +++---
 lib/Cake/bootstrap.php                        | 4 ----
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/index.php b/index.php
index 1dfeb30c8..10231902a 100644
--- a/index.php
+++ b/index.php
@@ -37,10 +37,4 @@
 		define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
 	}
 
-/**
- * Set the include path or define app and core path
- */
-	define('APP_PATH', ROOT . DS . APP_DIR . DS);
-	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-
 	require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php';
diff --git a/lib/Cake/Console/Command/CommandListShell.php b/lib/Cake/Console/Command/CommandListShell.php
index ce3017081..9ffdf83e3 100644
--- a/lib/Cake/Console/Command/CommandListShell.php
+++ b/lib/Cake/Console/Command/CommandListShell.php
@@ -45,7 +45,7 @@ class CommandListShell extends Shell {
 		if (empty($this->params['xml'])) {
 			$this->out(__d('cake_console', "<info>Current Paths:</info>"), 2);
 			$this->out(" -app: ". APP_DIR);
-			$this->out(" -working: " . rtrim(APP_PATH, DS));
+			$this->out(" -working: " . rtrim(APP, DS));
 			$this->out(" -root: " . rtrim(ROOT, DS));
 			$this->out(" -core: " . rtrim(CORE_PATH, DS));
 			$this->out("");
diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php
index cb72a2809..c88029cb8 100644
--- a/lib/Cake/Console/Command/Task/ProjectTask.php
+++ b/lib/Cake/Console/Command/Task/ProjectTask.php
@@ -50,7 +50,7 @@ class ProjectTask extends Shell {
 
 		while (!$project) {
 			$prompt = __d('cake_console', "What is the path to the project you want to bake?");
-			$project = $this->in($prompt, null, APP_PATH . 'myapp');
+			$project = $this->in($prompt, null, APP . 'myapp');
 		}
 
 		if ($project && !Folder::isAbsolute($project) && isset($_SERVER['PWD'])) {
diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
index 24b594ec3..2e1bd59e2 100644
--- a/lib/Cake/Console/Shell.php
+++ b/lib/Cake/Console/Shell.php
@@ -206,7 +206,7 @@ class Shell extends Object {
 		$this->out(__d('cake_console', '<info>Welcome to CakePHP %s Console</info>', 'v' . Configure::version()));
 		$this->hr();
 		$this->out(__d('cake_console', 'App : %s', APP_DIR));
-		$this->out(__d('cake_console', 'Path: %s', APP_PATH));
+		$this->out(__d('cake_console', 'Path: %s', APP));
 		$this->hr();
 	}
 
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
index 580440099..e188151c0 100644
--- a/lib/Cake/Console/ShellDispatcher.php
+++ b/lib/Cake/Console/ShellDispatcher.php
@@ -122,15 +122,15 @@ class ShellDispatcher {
 	private function __bootstrap() {
 		define('ROOT', $this->params['root']);
 		define('APP_DIR', $this->params['app']);
-		define('APP_PATH', $this->params['working'] . DS);
-		define('WWW_ROOT', APP_PATH . $this->params['webroot'] . DS);
+		define('APP', $this->params['working'] . DS);
+		define('WWW_ROOT', APP . $this->params['webroot'] . DS);
 		if (!is_dir(ROOT . DS . APP_DIR . DS . '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');
 		require CORE_PATH . 'Cake' . DS . 'bootstrap.php';
 
-		if (!file_exists(APP_PATH . 'Config' . DS . 'core.php')) {
+		if (!file_exists(APP . 'Config' . DS . 'core.php')) {
 			include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
 			App::build();
 		}
diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index 21b2a1e6d..e034b5566 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -31,10 +31,6 @@ 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');
 }