diff --git a/cake/libs/configure.php b/cake/libs/configure.php index 5b2a7e3c9..da29e0d1f 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -502,22 +502,15 @@ class Configure extends Object { */ function __buildPaths($paths) { $_this =& Configure::getInstance(); - $cache = false; - $basePaths = Cache::read('base_paths', '_cake_core_'); - - if (!$basePaths) { - $cache = true; - $core = $_this->corePaths(); - - $basePaths = array( - 'plugin' => APP . 'plugins' . DS, - 'behavior' => array(BEHAVIORS), - 'component' => array(COMPONENTS), - 'helper' => array(HELPERS), - 'controller' => array(CONTROLLERS), - 'view' => array(VIEWS), - 'model' => array(MODELS)); - } + $core = $_this->corePaths(); + $basePaths = array( + 'plugin' => APP . 'plugins' . DS, + 'behavior' => array(BEHAVIORS), + 'component' => array(COMPONENTS), + 'helper' => array(HELPERS), + 'controller' => array(CONTROLLERS), + 'view' => array(VIEWS), + 'model' => array(MODELS)); foreach ($basePaths as $type => $default) { $pathsVar = $type . 'Paths'; @@ -541,9 +534,6 @@ class Configure extends Object { $_this->{$pathsVar} = array_merge($_this->{$pathsVar}, $merge); } } - if ($cache) { - Cache::write('base_paths', array_filter($basePaths), '_cake_core_'); - } } /** * Loads the app/config/bootstrap.php diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index 10b23fc52..d4c72b979 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -27,8 +27,7 @@ /** * Include files */ -App::import('Core', 'Component'); -App::import('Core', 'View');; +App::import('Core', array('Component', 'View')); /** * Controller *