Merge pull request #571 from Mechzeit/2.0.x

isAllowed bugfix for Database ACL Adapter
phalcon · Apr 19, 2016 · f5cdd6e · f5cdd6e
2 parents 8fb5b62 + 823bf46
commit f5cdd6e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Library/Phalcon/Acl/Adapter/Database.php b/Library/Phalcon/Acl/Adapter/Database.php
@@ -407,7 +407,7 @@ public function isAllowed($role, $resource, $access)
             // access_name should be given one or 'any'
             "AND access_name IN (?, '*')",
             // order be the sum of bools for 'literals' before 'any'
-            "ORDER BY (roles_name != '*')+(resources_name != '*')+(access_name != '*') DESC",
+            "ORDER BY ".$this->connection->escapeIdentifier('allowed')." DESC",
             // get only one...
             'LIMIT 1'
         ]);