Merge branch '4.1'
* 4.1: [HttpFoundation] fix merge
This commit is contained in:
commit
d3a43b177a
@ -62,7 +62,7 @@ abstract class AbstractSessionListener implements EventSubscriberInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
$session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);
|
$session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);
|
||||||
$this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : null;
|
$this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onKernelResponse(FilterResponseEvent $event)
|
public function onKernelResponse(FilterResponseEvent $event)
|
||||||
|
Reference in New Issue
Block a user