From 65136e8cb1ed930794e903a84774e133cb559db7 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Tue, 8 Mar 2011 15:08:28 -0430 Subject: [PATCH] Re-adding the support for the topmost plugins folder and homogenizing some constants in shell dispatcher --- lib/Cake/Console/ShellDispatcher.php | 4 ++-- lib/Cake/Core/App.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php index 6198bc338a4..0d4ef5d6f5d 100644 --- a/lib/Cake/Console/ShellDispatcher.php +++ b/lib/Cake/Console/ShellDispatcher.php @@ -85,10 +85,10 @@ function __initConstants() { if (!defined('CAKE_CORE_INCLUDE_PATH')) { define('DS', DIRECTORY_SEPARATOR); - define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(dirname(__FILE__)))); + define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(dirname(dirname(__FILE__))))); define('CAKEPHP_SHELL', true); if (!defined('CORE_PATH')) { - define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); + define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS . 'lib' . DS); } } } diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index dbc220db1e4..583143e8a73 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -315,7 +315,7 @@ public static function build($paths = array(), $reset = false) { 'libs' => array('%s' . 'libs' . DS), 'locales' => array('%s' . 'locale' . DS), 'vendors' => array('%s' . 'vendors' . DS, VENDORS), - 'plugins' => array(APP . 'plugins' . DS) + 'plugins' => array(APP . 'plugins' . DS, CAKE_CORE_INCLUDE_PATH . DS . 'plugins' . DS) ); }