Skip to content

Commit

Permalink
Remove duplicate order key.
Browse files Browse the repository at this point in the history
This was a mistake made in 4b6dba0.

Fixes #5376
  • Loading branch information
markstory committed Dec 11, 2014
1 parent 23c4b7b commit cf108db
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Model/Behavior/TreeBehavior.php
Expand Up @@ -494,8 +494,8 @@ public function getPath(Model $Model, $id = null, $fields = null, $recursive = n
$item = $result[0];
$results = $Model->find('all', array(
'conditions' => array($scope, $Model->escapeField($left) . ' <=' => $item[$left], $Model->escapeField($right) . ' >=' => $item[$right]),
'fields' => $fields, 'order' => array($Model->escapeField($left) => 'asc'),
'order' => false,
'fields' => $fields,
'order' => array($Model->escapeField($left) => 'asc'),
'recursive' => $recursive
));
return $results;
Expand Down

3 comments on commit cf108db

@jippi
Copy link
Contributor

@jippi jippi commented on cf108db Dec 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

6am Jippi here.. this took down our internal tooling today - maybe get this pushed out as an hot patch asap? kthxplz

@dereuromark
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add a test case to prevent future regressions.

@markstory
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I plan on doing the 2.6.0 release today, I can do a 2.5 release afterwards as well.

Please sign in to comment.