Another fix for array_values() throwing a warning when using Tree Be…

…havior under certain situations.
cakephp · Feb 5, 2010 · 2c1e6de · 2c1e6de
1 parent 4b269e3
commit 2c1e6de
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
@@ -163,10 +163,15 @@ function beforeSave(&$Model) {
 				$Model->data[$Model->alias][$parent] = null;
 				$this->_addToWhitelist($Model, $parent);
 			} else {
-				list($node) = array_values($Model->find('first', array(
+				$values = $Model->find('first', array(
 					'conditions' => array($scope,$Model->escapeField() => $Model->id),
 					'fields' => array($Model->primaryKey, $parent, $left, $right ), 'recursive' => $recursive)
-				));
+				);
+
+				if ($values === false) {
+					return false;
+				}
+				list($node) = array_values($values);
 
 				$parentNode = $Model->find('first', array(
 					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),