fix merge
This commit is contained in:
parent
d9c9e0cf52
commit
61cf143727
@ -175,7 +175,6 @@ class ContextListener implements ListenerInterface
|
||||
|
||||
// tokens can be deauthenticated if the user has been changed.
|
||||
if (!$newToken->isAuthenticated()) {
|
||||
if ($this->logoutOnUserChange) {
|
||||
$userDeauthenticated = true;
|
||||
|
||||
if (null !== $this->logger) {
|
||||
@ -185,9 +184,6 @@ class ContextListener implements ListenerInterface
|
||||
continue;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
$token->setUser($refreshedUser);
|
||||
|
||||
if (null !== $this->logger) {
|
||||
|
Reference in New Issue
Block a user