diff options
| author | Arnout Boks <arnoutboks@gmail.com> | 2011-08-13 12:46:41 +0200 |
|---|---|---|
| committer | Arnout Boks <arnoutboks@gmail.com> | 2011-08-13 12:46:41 +0200 |
| commit | 8791cf2de673ca3b066c37cb9988cd9fe52d177f (patch) | |
| tree | 6f56986f608b74be70b037c31bda221962cd6353 | |
| parent | 96c4c94be0646bda1e77b48e82c930446d97b930 (diff) | |
| download | symfony-security-8791cf2de673ca3b066c37cb9988cd9fe52d177f.zip symfony-security-8791cf2de673ca3b066c37cb9988cd9fe52d177f.tar.gz symfony-security-8791cf2de673ca3b066c37cb9988cd9fe52d177f.tar.bz2 | |
[Security] Fixed incorrect merge of two modifications (53f5c23c and 85199677) to AclVoter
| -rw-r--r-- | Acl/Voter/AclVoter.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Acl/Voter/AclVoter.php b/Acl/Voter/AclVoter.php index 574b5c2..7dd80f1 100644 --- a/Acl/Voter/AclVoter.php +++ b/Acl/Voter/AclVoter.php @@ -82,14 +82,13 @@ class AclVoter implements VoterInterface $this->logger->debug(sprintf('Object identity unavailable. Voting to %s', $this->allowIfObjectIdentityUnavailable? 'grant access' : 'abstain')); } - if (!$this->supportsClass($oid->getType())) { - return self::ACCESS_ABSTAIN; - } - - $sids = $this->securityIdentityRetrievalStrategy->getSecurityIdentities($token); - return $this->allowIfObjectIdentityUnavailable ? self::ACCESS_GRANTED : self::ACCESS_ABSTAIN; } + + if (!$this->supportsClass($oid->getType())) { + return self::ACCESS_ABSTAIN; + } + $sids = $this->securityIdentityRetrievalStrategy->getSecurityIdentities($token); try { |