A free, self-hostable news aggregator…
Fiix cookies with some browsers (#8867)
Alexandre Alapetite8e007af39d67
diff --git a/app/Controllers/authController.php b/app/Controllers/authController.phpindex a8938228a..88e81a902 100644--- a/app/Controllers/authController.php+++ b/app/Controllers/authController.php@@ -187,6 +187,8 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {Minz_Request::setBadNotification(_t('feedback.auth.login.invalid'));Minz_Request::forward(['c' => 'auth', 'a' => 'login'], false);}+ } else {+ Minz_Session::deleteLegacyCookie('FreshRSS'); // Delete legacy cookie (before 1.29.0)}}diff --git a/lib/Minz/Session.php b/lib/Minz/Session.phpindex 43678ab2c..5251e31fa 100644--- a/lib/Minz/Session.php+++ b/lib/Minz/Session.php@@ -55,14 +55,6 @@ class Minz_Session {session_name($name);- // Delete legacy cookie (before 1.29.0) if it exists- if (isset($_COOKIE[$name])) {- $legacyDir = self::getLegacyCookieDir();- if ($legacyDir !== '' && $legacyDir !== '/') {- setcookie($name, '', ['expires' => 1, 'path' => $legacyDir]);- }- }-// When using cookies (default value), session_start() sends HTTP headerssession_start();session_write_close();@@ -205,6 +197,16 @@ class Minz_Session {return $cookie_dir;}+ /** Delete legacy cookie (before 1.29.0) if it exists */+ public static function deleteLegacyCookie(string $name): void {+ if (isset($_COOKIE[$name])) {+ $legacyDir = self::getLegacyCookieDir();+ if ($legacyDir !== '' && $legacyDir !== '/') {+ setcookie($name, '', ['expires' => 1, 'path' => $legacyDir]);+ }+ }+ }+/*** Regenerate a session id.*/