summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2011-05-09 14:26:36 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2011-05-09 14:26:36 +0200
commitbcf9c94dfabc331d569bc564b12660f2a03ad4b3 (patch)
treee48cfffd06eefe7b130c833a578ff0922b6bf914
parent1a2e2b2f004c3fdf7aec04995f7eb6241627aa2c (diff)
parent8ed913984759757b9063ca424a717bd9e3ec81e9 (diff)
downloadsymfony-security-bcf9c94dfabc331d569bc564b12660f2a03ad4b3.zip
symfony-security-bcf9c94dfabc331d569bc564b12660f2a03ad4b3.tar.gz
symfony-security-bcf9c94dfabc331d569bc564b12660f2a03ad4b3.tar.bz2
Merge remote branch 'schmittjoh/security'
* schmittjoh/security: [HttpFoundation] added unit test [Security][HttpFoundation] splits Request::hasSession() into hasSession(), and hasPreviousSession() [SecurityBundle] added some tests add provider to configuration update DI to handle change in config and another provider separate dbal specific acl config add provider to configuration update DI to handle change in config and another provider separate dbal specific acl config
-rw-r--r--Http/Firewall/ContextListener.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index a20eaab..331a1e3 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -62,7 +62,7 @@ class ContextListener implements ListenerInterface
{
$request = $event->getRequest();
- $session = $request->hasSession() ? $request->getSession() : null;
+ $session = $request->hasPreviousSession() ? $request->getSession() : null;
if (null === $session || null === $token = $session->get('_security_'.$this->contextKey)) {
$this->context->setToken(null);