From fd0c9823faf0597f6f83b1b45964e118b256baa1 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 17 Nov 2020 15:24:08 -0700
Subject: [PATCH] better handle cookie_samesite if null

---
 .../src/Grav/Common/Service/SessionServiceProvider.php   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Service/SessionServiceProvider.php b/system/src/Grav/Common/Service/SessionServiceProvider.php
index 7521dac6a..1d1dbe066 100644
--- a/system/src/Grav/Common/Service/SessionServiceProvider.php
+++ b/system/src/Grav/Common/Service/SessionServiceProvider.php
@@ -89,8 +89,13 @@ class SessionServiceProvider implements ServiceProviderInterface
                 'cookie_domain' => $cookie_domain,
                 'cookie_secure' => $cookie_secure,
                 'cookie_httponly' => $cookie_httponly,
-                'cookie_samesite' => $cookie_samesite                
-            ] + (array) $config->get('system.session.options');
+            ];
+
+            if ($cookie_samesite) {
+                $options['cookie_samesite'] = $cookie_samesite;
+            }
+
+            $options += (array) $config->get('system.session.options');
 
             $session = new Session($options);
             $session->setAutoStart($enabled);