Permalink
Browse files

Removing the magical addition of SessionComponent to components array…

…. This makes components more declarative, and removes magic that cannot be undone by the end developer.
  • Loading branch information...
1 parent eb2c34a commit ebf99de965c115c2213d22a731c6b8930e344012 @markstory markstory committed Jan 14, 2010
Showing with 1 addition and 4 deletions.
  1. +0 −3 cake/libs/controller/component.php
  2. +1 −1 cake/libs/controller/controller.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);
@@ -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.

0 comments on commit ebf99de

Please sign in to comment.