diff options
| -rw-r--r-- | Acl/Dbal/AclProvider.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php index 00bc01d..4a2870f 100644 --- a/Acl/Dbal/AclProvider.php +++ b/Acl/Dbal/AclProvider.php @@ -320,11 +320,9 @@ class AclProvider implements AclProviderInterface // has the ACL been hydrated during this hydration cycle? if (isset($acls[$aclId])) { $acl = $acls[$aclId]; - } - // has the ACL been hydrated during any previous cycle, or was possibly loaded // from cache? - else if (isset($loadedAcls[$classType][$objectIdentifier])) { + } else if (isset($loadedAcls[$classType][$objectIdentifier])) { $acl = $loadedAcls[$classType][$objectIdentifier]; // keep reference in local array (saves us some hash calculations) @@ -337,10 +335,8 @@ class AclProvider implements AclProviderInterface $oidCache[$objectIdentifier.$classType] = $acl->getObjectIdentity(); } $result->attach($oidCache[$objectIdentifier.$classType], $acl); - } - // so, this hasn't been hydrated yet - else { + } else { // create object identity if we haven't done so yet $oidLookupKey = $objectIdentifier.$classType; if (!isset($oidCache[$oidLookupKey])) { @@ -632,4 +628,4 @@ QUERY; { return $this->connection->executeQuery($this->getSelectObjectIdentityIdSql($oid))->fetchColumn(); } -}
\ No newline at end of file +} |