diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php index 6c26a9ddd04..b6e3a2c93c2 100644 --- a/cake/libs/controller/component.php +++ b/cake/libs/controller/component.php @@ -185,9 +185,6 @@ function shutdown(&$controller) { function _loadComponents(&$object, $parent = null) { $base = $this->__controllerVars['base']; $normal = Set::normalize($object->components); - if ($parent == null) { - $normal = Set::merge(array('Session' => null), $normal); - } foreach ((array)$normal as $component => $config) { $plugin = isset($this->__controllerVars['plugin']) ? $this->__controllerVars['plugin'] . '.' : null; list($plugin, $component) = pluginSplit($component, true, $plugin); diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index 6f12da1e4d4..397eae4abec 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -229,7 +229,7 @@ class Controller extends Object { * @access public * @link http://book.cakephp.org/view/53/components-helpers-and-uses */ - var $components = array(); + var $components = array('Session'); /** * The name of the View class this controller sends output to.