From 95168cee6e4a75f85ed414e7be48c93eb9d49929 Mon Sep 17 00:00:00 2001 From: dogmatic69 Date: Tue, 24 Aug 2010 12:14:46 +0100 Subject: [PATCH] casting the find as an array to avoid errors with array_values() fixes #1041 and 4 failing tests (3 previous) Signed-off-by: mark_story --- cake/libs/model/behaviors/tree.php | 2 +- cake/tests/cases/libs/model/behaviors/tree.test.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php index 10bd8544b..349506213 100644 --- a/cake/libs/model/behaviors/tree.php +++ b/cake/libs/model/behaviors/tree.php @@ -284,7 +284,7 @@ class TreeBehavior extends ModelBehavior { if (!$id) { $conditions = $scope; } else { - $result = array_values($Model->find('first', array( + $result = array_values((array)$Model->find('first', array( 'conditions' => array($scope, $Model->escapeField() => $id), 'fields' => array($left, $right), 'recursive' => $recursive diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php index c0dc9ccc0..39475cd60 100644 --- a/cake/tests/cases/libs/model/behaviors/tree.test.php +++ b/cake/tests/cases/libs/model/behaviors/tree.test.php @@ -1089,6 +1089,8 @@ class NumberTreeTest extends CakeTestCase { array($modelClass => array( 'id' => 6, 'name' => '1.2.1', $parentField => 5, $leftField => 9, $rightField => 10)), array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12))); $this->assertEqual($total, $expects); + + $this->assertEqual(array(), $this->Tree->children(10000)); } /**