From dc5742d28fc4ff1219566ee9a4d898540fceb72f Mon Sep 17 00:00:00 2001 From: nate Date: Fri, 11 Apr 2008 05:48:39 +0000 Subject: [PATCH] Correcting query order in DB_ACL::check(), fixes #4309 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6654 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/controller/components/acl.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php index d647b058b..cc3c2eaf9 100644 --- a/cake/libs/controller/components/acl.php +++ b/cake/libs/controller/components/acl.php @@ -300,10 +300,13 @@ class DB_ACL extends AclBase { for ($i = 0 ; $i < count($aroPath); $i++) { $permAlias = $this->Aro->Permission->alias; - $perms = $this->Aro->Permission->find('all', array('conditions' => array( - "{$permAlias}.aro_id" => $aroPath[$i][$this->Aro->alias]['id'], - "{$permAlias}.aco_id" => $acoIDs), - null, array($this->Aco->alias . '.lft' => 'desc'), null, null, 0 + $perms = $this->Aro->Permission->find('all', array( + 'conditions' => array( + "{$permAlias}.aro_id" => $aroPath[$i][$this->Aro->alias]['id'], + "{$permAlias}.aco_id" => $acoIDs + ), + 'order' => array($this->Aco->alias . '.lft' => 'desc'), + 'recursive' => 0 )); if (empty($perms)) {