Browse Source

Enforcing component callback disabling in Dispatcher (do $this->Component->enabled = false in beforeFilter).

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4305 3807eeeb-6ff5-0310-8944-8be069107fe0
nate 19 years ago
parent
commit
68ea832150
1 changed files with 3 additions and 1 deletions
  1. 3 1
      cake/dispatcher.php

+ 3 - 1
cake/dispatcher.php

@@ -375,7 +375,9 @@ class Dispatcher extends Object {
 
 		foreach($controller->components as $c) {
 			if (isset($controller->{$c}) && is_object($controller->{$c}) && is_callable(array($controller->{$c}, 'startup'))) {
-				$controller->{$c}->startup($controller);
+				if (!array_key_exists('enabled', get_object_vars($controller->{$c})) || $controller->{$c}->enabled == true) {
+					$controller->{$c}->startup($controller);
+				}
 			}
 		}
 	}