Skip to content

Commit

Permalink
Removing the magical addition of SessionComponent to components array…
Browse files Browse the repository at this point in the history
…. This makes components more declarative, and removes magic that cannot be undone by the end developer.
  • Loading branch information
markstory committed Jan 14, 2010
1 parent eb2c34a commit ebf99de
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions cake/libs/controller/component.php
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion cake/libs/controller/controller.php
Expand Up @@ -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.
Expand Down

0 comments on commit ebf99de

Please sign in to comment.