opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.2. For more information, see https://www.drupal.org/project/drupal/releases/8.2.2

Browse source
This commit is contained in:
Pantheon Automation 2016-11-02 11:43:31 -07:00 • committed by Greg Anderson
parent 23ffed3665
commit 507b45a0ed
378 changed files with 11434 additions and 5542 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/lib/Drupal/Core/Session/SessionManager.php
View file

@ -257,7 +257,8 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
// Unset the session cookies.
$session_name = $this->getName();
$cookies = $this->requestStack->getCurrentRequest()->cookies;
if ($cookies->has($session_name)) {
// setcookie() can only be called when headers are not yet sent.
if ($cookies->has($session_name) && !headers_sent()) {
$params = session_get_cookie_params();
setcookie($session_name, '', REQUEST_TIME - 3600, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
$cookies->remove($session_name);