From 9bd975f6e3cfc6d4fabcf19ce8a6607edc5ef083 Mon Sep 17 00:00:00 2001
From: slackero <slackero@gmail.com>
Date: Sun, 4 Dec 2022 08:34:15 +0100
Subject: [PATCH] Refactor cookie samesite config check

---
 include/inc_lib/default.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/inc_lib/default.inc.php b/include/inc_lib/default.inc.php
index 2c580ac66..c01adb843 100755
--- a/include/inc_lib/default.inc.php
+++ b/include/inc_lib/default.inc.php
@@ -969,10 +969,10 @@ function _initSession() {
     $GLOBALS['phpwcms']['session_cookie_params']['domain'] = $GLOBALS['phpwcms']['parse_url']['host'];
     $GLOBALS['phpwcms']['session_cookie_params']['path'] = PHPWCMS_BASEPATH;
     $GLOBALS['phpwcms']['session_cookie_params']['secure'] = PHPWCMS_SSL;
-    if (empty($GLOBALS['phpwcms']['session.cookie_samesite']) && empty($GLOBALS['phpwcms']['session_cookie_params']['samesite'])) {
-        $GLOBALS['phpwcms']['session_cookie_params']['samesite'] = PHPWCMS_SSL ? 'Lax' : 'None';
-    } else {
+    if(isset($GLOBALS['phpwcms']['session.cookie_samesite'])) {
         $GLOBALS['phpwcms']['session_cookie_params']['samesite'] = $GLOBALS['phpwcms']['session.cookie_samesite'];
+    } elseif(empty($GLOBALS['phpwcms']['session_cookie_params']['samesite'])) {
+        $GLOBALS['phpwcms']['session_cookie_params']['samesite'] = PHPWCMS_SSL ? 'Lax' : 'None';
     }
     @session_set_cookie_params($GLOBALS['phpwcms']['session_cookie_params']);