Fix looping issue in Component loading.

Add failure condition to test suite. Apple -> Orange -> Banana -> Apple is now the chain in the testsuite. Fixes #2168
cakephp · Oct 28, 2011 · 7b023bc · 7b023bc
1 parent adb5be6
commit 7b023bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
@@ -257,10 +257,10 @@ function _loadComponents(&$object, $parent = null) {
 				if (!empty($config)) {
 					$this->__settings[$component] = $config;
 				}
-			}
 
-			if (isset($object->{$component}->components) && is_array($object->{$component}->components) && (!isset($object->{$component}->{$parent}))) {
-				$this->_loadComponents($object->{$component}, $component);
+				if (isset($object->{$component}->components) && is_array($object->{$component}->components) && (!isset($object->{$component}->{$parent}))) {
+					$this->_loadComponents($object->{$component}, $component);
+				}
 			}
 		}
 	}

diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
@@ -227,6 +227,14 @@ class BananaComponent extends Object {
  */
 	var $testField = 'BananaField';
 
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Apple');
+
 /**
  * startup method
  *