From 5cdeb28e6b244a7335aebbe94d19df56bc2004f4 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 4 Dec 2020 03:33:59 -0700 Subject: [PATCH] Revert "better handle cookie_samesite if null" This reverts commit fd0c9823faf0597f6f83b1b45964e118b256baa1. --- .../src/Grav/Common/Service/SessionServiceProvider.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/system/src/Grav/Common/Service/SessionServiceProvider.php b/system/src/Grav/Common/Service/SessionServiceProvider.php index 1d1dbe066..7521dac6a 100644 --- a/system/src/Grav/Common/Service/SessionServiceProvider.php +++ b/system/src/Grav/Common/Service/SessionServiceProvider.php @@ -89,13 +89,8 @@ class SessionServiceProvider implements ServiceProviderInterface 'cookie_domain' => $cookie_domain, 'cookie_secure' => $cookie_secure, 'cookie_httponly' => $cookie_httponly, - ]; - - if ($cookie_samesite) { - $options['cookie_samesite'] = $cookie_samesite; - } - - $options += (array) $config->get('system.session.options'); + 'cookie_samesite' => $cookie_samesite + ] + (array) $config->get('system.session.options'); $session = new Session($options); $session->setAutoStart($enabled);