From 9fcc7058f5bf20ecd8f50ee1ee999d72290ffec3 Mon Sep 17 00:00:00 2001
From: Kristof Jochmans <kristof.jochmans@kunstmaan.be>
Date: Tue, 13 May 2014 16:07:53 +0200
Subject: [PATCH] fix acl query

---
 Helper/Security/Acl/AclHelper.php       | 3 ++-
 Helper/Security/Acl/AclNativeHelper.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Helper/Security/Acl/AclHelper.php b/Helper/Security/Acl/AclHelper.php
index 23b20cc8..e4cd91b5 100644
--- 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
index e8e7fb29..697c4b0f 100644
--- 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;