diff --git a/src/Control/Director.php b/src/Control/Director.php index 88908ef6e..d449f77d8 100644 --- a/src/Control/Director.php +++ b/src/Control/Director.php @@ -207,12 +207,17 @@ class Director implements TemplateGlobalProvider if ($session instanceof Session) { // Note: If passing $session as object, ensure that changes are written back // This is important for classes such as FunctionalTest which emulate cross-request persistence - $newVars['_SESSION'] = $session->getAll(); - $finally[] = function () use ($session) { + $newVars['_SESSION'] = $sessionArray = $session->getAll(); + $finally[] = function () use ($session, $sessionArray) { if (isset($_SESSION)) { + // Set new / updated keys foreach ($_SESSION as $key => $value) { $session->set($key, $value); } + // Unset removed keys + foreach (array_diff_key($sessionArray, $_SESSION) as $key => $value) { + $session->clear($key); + } } }; } else {