Re-adding the support for the topmost plugins folder and homogenizing some constants in shell dispatcher

This commit is contained in:
Jose Lorenzo Rodriguez 2011-03-08 15:08:28 -04:30
parent 234d781f77
commit 65136e8cb1
2 changed files with 3 additions and 3 deletions

View file

@ -85,10 +85,10 @@ class ShellDispatcher {
if (!defined('CAKE_CORE_INCLUDE_PATH')) { if (!defined('CAKE_CORE_INCLUDE_PATH')) {
define('DS', DIRECTORY_SEPARATOR); 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); define('CAKEPHP_SHELL', true);
if (!defined('CORE_PATH')) { if (!defined('CORE_PATH')) {
define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS . 'lib' . DS);
} }
} }
} }

View file

@ -315,7 +315,7 @@ class App {
'libs' => array('%s' . 'libs' . DS), 'libs' => array('%s' . 'libs' . DS),
'locales' => array('%s' . 'locale' . DS), 'locales' => array('%s' . 'locale' . DS),
'vendors' => array('%s' . 'vendors' . DS, VENDORS), 'vendors' => array('%s' . 'vendors' . DS, VENDORS),
'plugins' => array(APP . 'plugins' . DS) 'plugins' => array(APP . 'plugins' . DS, CAKE_CORE_INCLUDE_PATH . DS . 'plugins' . DS)
); );
} }