Merge branch 'zoghal-fix-tree-condidtions' into 2.3

Refs #GH-1049
cakephp · Dec 26, 2012 · 9fc4678 · 9fc4678
2 parents 79c6cbd + ed76132
commit 9fc4678
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php
@@ -941,7 +941,8 @@ protected function _getMax(Model $Model, $scope, $right, $recursive = -1, $creat
 		list($edge) = array_values($Model->find('first', array(
 			'conditions' => $scope,
 			'fields' => $db->calculate($Model, 'max', array($name, $right)),
-			'recursive' => $recursive
+			'recursive' => $recursive,
+			'callbacks' => false
 		)));
 		return (empty($edge[$right])) ? 0 : $edge[$right];
 	}
@@ -961,7 +962,8 @@ protected function _getMin(Model $Model, $scope, $left, $recursive = -1) {
 		list($edge) = array_values($Model->find('first', array(
 			'conditions' => $scope,
 			'fields' => $db->calculate($Model, 'min', array($name, $left)),
-			'recursive' => $recursive
+			'recursive' => $recursive,
+			'callbacks' => false
 		)));
 		return (empty($edge[$left])) ? 0 : $edge[$left];
 	}