Resolved #4227 where expire_session_on_browser_close config overrid…

…e was not always respected
ExpressionEngine · Apr 15, 2024 · cae9a6f · cae9a6f
1 parent 9d0e3d5
commit cae9a6f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/ee/legacy/core/Input.php b/system/ee/legacy/core/Input.php
@@ -143,8 +143,8 @@ public function set_cookie($name = '', $value = '', $expire = '', $domain = '',
  // Clean up the value.
  $data['value'] = stripslashes($data['value']);
 
- // check the cookie setting for expiration date
- if (is_numeric($data['expire'])) {
+ // check the cookie setting for expiration date, unless config override is forcing the lowest value
+ if (is_numeric($data['expire']) && ! bool_config_item('expire_session_on_browser_close')) {
  $loadedCookieSettings = ee('CookieRegistry')->getCookieSettings($name);
  if (!empty($loadedCookieSettings)) {
  if ($loadedCookieSettings['cookie_lifetime'] === null) {