diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.1'

Browse Source 
* 4.1:
  fix merge
This commit is contained in:
Christian Flothmann 2018-10-10 16:58:57 +02:00
commit 493c13a9fb
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Security/Http/Firewall/ContextListener.php
View File

@ -175,7 +175,6 @@ class ContextListener implements ListenerInterface
// tokens can be deauthenticated if the user has been changed. // tokens can be deauthenticated if the user has been changed.
if (!$newToken->isAuthenticated()) { if (!$newToken->isAuthenticated()) {
if ($this->logoutOnUserChange) {
$userDeauthenticated = true; $userDeauthenticated = true;
if (null !== $this->logger) { if (null !== $this->logger) {
@ -185,9 +184,6 @@ class ContextListener implements ListenerInterface
continue; continue;
} }
return null;
}
$token->setUser($refreshedUser); $token->setUser($refreshedUser);
if (null !== $this->logger) { if (null !== $this->logger) {