More fixes after the recent changes in App::core()

cakephp · Mar 12, 2011 · bab30bd · bab30bd
1 parent c188d1a
commit bab30bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php
@@ -53,7 +53,7 @@ public function execute() {
 		}
 
 		if (empty($this->params['skel'])) {
-			$core = App::core('shells');
+			$core = App::core('Console');
 			$skelPath = dirname($core[0]) . DS . 'templates' . DS . 'skel';
 			if (is_dir($skelPath) === true) {
 				$this->params['skel'] = $skelPath;

diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php
@@ -400,12 +400,9 @@ public static function trimPath($path) {
 		} elseif (strpos($path, ROOT) === 0) {
 			return str_replace(ROOT, 'ROOT', $path);
 		}
-		$corePaths = App::core('cake');
-
-		foreach ($corePaths as $corePath) {
-			if (strpos($path, $corePath) === 0) {
-				return str_replace($corePath, 'CORE' .DS . 'cake' .DS, $path);
-			}
+
+		if (strpos($path, LIBS) === 0) {
+			return str_replace($corePath, 'CORE' . DS, $path);
 		}
 		return $path;
 	}