summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2011-12-08 15:36:57 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2011-12-08 15:36:57 +0100
commit223aaf86a0173c799556c935afa9144d41c76fa2 (patch)
tree6e03d78ab12ea4a70d0cd219277afab0b9a8bbae
parentfe564a0e55797e2b06a99c1cd8cbcd9a090e2566 (diff)
parentd2bdba5c73733dbc45153658584f16b57126090c (diff)
downloadsymfony-security-223aaf86a0173c799556c935afa9144d41c76fa2.zip
symfony-security-223aaf86a0173c799556c935afa9144d41c76fa2.tar.gz
symfony-security-223aaf86a0173c799556c935afa9144d41c76fa2.tar.bz2
merged 2.0
-rw-r--r--Core/SecurityContext.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index 1065163..6d11850 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -63,7 +63,11 @@ class SecurityContext implements SecurityContextInterface
$this->token = $this->authenticationManager->authenticate($this->token);
}
- return $this->accessDecisionManager->decide($this->token, (array) $attributes, $object);
+ if (!is_array($attributes)) {
+ $attributes = array($attributes);
+ }
+
+ return $this->accessDecisionManager->decide($this->token, $attributes, $object);
}
/**