diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2011-12-18 14:48:17 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2011-12-18 14:48:17 +0100 |
| commit | c65b37ce9b93a1bbfc6f33a41e834ff080d24c0f (patch) | |
| tree | 2f22d35b8b615c348b29b64f8707435d2d306db9 /Acl/Dbal | |
| parent | 60fe04c4834d8a734b2902ceddf7bbe2ac3d0bcd (diff) | |
| parent | 1df44a7f54710ec4f270e7398bf1908af8f8ada8 (diff) | |
| download | symfony-security-c65b37ce9b93a1bbfc6f33a41e834ff080d24c0f.zip symfony-security-c65b37ce9b93a1bbfc6f33a41e834ff080d24c0f.tar.gz symfony-security-c65b37ce9b93a1bbfc6f33a41e834ff080d24c0f.tar.bz2 | |
merged 2.0
Diffstat (limited to 'Acl/Dbal')
| -rw-r--r-- | Acl/Dbal/AclProvider.php | 2 | ||||
| -rw-r--r-- | Acl/Dbal/MutableAclProvider.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php index e57929e..8413843 100644 --- a/Acl/Dbal/AclProvider.php +++ b/Acl/Dbal/AclProvider.php @@ -494,7 +494,7 @@ QUERY; $acl = $acls[$aclId]; // has the ACL been hydrated during any previous cycle, or was possibly loaded // from cache? - } else if (isset($loadedAcls[$classType][$objectIdentifier])) { + } elseif (isset($loadedAcls[$classType][$objectIdentifier])) { $acl = $loadedAcls[$classType][$objectIdentifier]; // keep reference in local array (saves us some hash calculations) diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index f1c5e08..3ae08d3 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -511,7 +511,7 @@ QUERY; if ($sid instanceof UserSecurityIdentity) { $identifier = $sid->getClass().'-'.$sid->getUsername(); $username = true; - } else if ($sid instanceof RoleSecurityIdentity) { + } elseif ($sid instanceof RoleSecurityIdentity) { $identifier = $sid->getRole(); $username = false; } else { @@ -579,7 +579,7 @@ QUERY; if ($sid instanceof UserSecurityIdentity) { $identifier = $sid->getClass().'-'.$sid->getUsername(); $username = true; - } else if ($sid instanceof RoleSecurityIdentity) { + } elseif ($sid instanceof RoleSecurityIdentity) { $identifier = $sid->getRole(); $username = false; } else { |