Merge pull request #305 from Kunstmaan/fix_acl

fix acl query
Kunstmaan · May 13, 2014 · 395f68c · 395f68c
2 parents 09dd5c3 + 9fcc705
commit 395f68c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Helper/Security/Acl/AclHelper.php b/Helper/Security/Acl/AclHelper.php
@@ -180,9 +180,10 @@ private function getPermittedAclIdsSQLForUser(Query $query)
     OR {$aclConnection->getDatabasePlatform()->getIsNullExpression('e.object_identity_id')})
 )
 LEFT JOIN {$database}.acl_security_identities s ON (
-s.id = e.security_identity_id AND (s.identifier = {$inString})
+s.id = e.security_identity_id
 )
 WHERE c.class_type = {$rootEntity}
+AND (s.identifier = {$inString})
 AND e.mask & {$mask} > 0
 SELECTQUERY;
 

diff --git a/Helper/Security/Acl/AclNativeHelper.php b/Helper/Security/Acl/AclNativeHelper.php
@@ -112,9 +112,10 @@ public function apply(QueryBuilder $queryBuilder, PermissionDefinition $permissi
     OR {$aclConnection->getDatabasePlatform()->getIsNullExpression('e.object_identity_id')})
 )
 LEFT JOIN {$database}.acl_security_identities s ON (
-s.id = e.security_identity_id AND (s.identifier = {$inString})
+s.id = e.security_identity_id
 )
 WHERE c.class_type = {$rootEntity}
+AND (s.identifier = {$inString})
 AND e.mask & {$mask} > 0
 SELECTQUERY;