adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Refs #GH-1049
This commit is contained in:
mark_story 2012-12-26 14:10:58 -05:00
commit 9fc4678fa3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Model/Behavior/TreeBehavior.php
View file

@ -941,7 +941,8 @@ class TreeBehavior extends ModelBehavior {
list($edge) = array_values($Model->find('first', array( list($edge) = array_values($Model->find('first', array(
'conditions' => $scope, 'conditions' => $scope,
'fields' => $db->calculate($Model, 'max', array($name, $right)), 'fields' => $db->calculate($Model, 'max', array($name, $right)),
'recursive' => $recursive 'recursive' => $recursive,
'callbacks' => false
))); )));
return (empty($edge[$right])) ? 0 : $edge[$right]; return (empty($edge[$right])) ? 0 : $edge[$right];
} }
@ -961,7 +962,8 @@ class TreeBehavior extends ModelBehavior {
list($edge) = array_values($Model->find('first', array( list($edge) = array_values($Model->find('first', array(
'conditions' => $scope, 'conditions' => $scope,
'fields' => $db->calculate($Model, 'min', array($name, $left)), 'fields' => $db->calculate($Model, 'min', array($name, $left)),
'recursive' => $recursive 'recursive' => $recursive,
'callbacks' => false
))); )));
return (empty($edge[$left])) ? 0 : $edge[$left]; return (empty($edge[$left])) ? 0 : $edge[$left];
} }