From 8791cf2de673ca3b066c37cb9988cd9fe52d177f Mon Sep 17 00:00:00 2001 From: Arnout Boks Date: Sat, 13 Aug 2011 12:46:41 +0200 Subject: [Security] Fixed incorrect merge of two modifications (53f5c23c and 85199677) to AclVoter --- Acl/Voter/AclVoter.php | 11 +++++------ 1 file 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 { -- cgit v1.1