From a479d7540533d1e8bac78447548b9c0c65753023 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Mon, 10 Nov 2025 12:25:19 +0100 Subject: [PATCH] belt and braces: reset the template cookie, if function is not enabled --- lib/Controller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Controller.php b/lib/Controller.php index 3d316687..188524d5 100644 --- a/lib/Controller.php +++ b/lib/Controller.php @@ -434,11 +434,15 @@ class Controller setcookie('lang', $languageselection, array('SameSite' => 'Lax', 'Secure' => true)); } - // set template cookie if that functionality was enabled + // set template cookie if that functionality was enabled, otherwise delete any existing cookie $templateselection = ''; if ($this->_conf->getKey('templateselection')) { $templateselection = TemplateSwitcher::getTemplate(); setcookie('template', $templateselection, array('SameSite' => 'Lax', 'Secure' => true)); + } elseif (array_key_exists('template', $_COOKIE)) { + unset($_COOKIE['template']); // ensure value is not re-used in template switcher + $expiredInAllTimezones = time() - 86400; + setcookie('template', '', array('expires' => $expiredInAllTimezones, 'SameSite' => 'Lax', 'Secure' => true)); } // strip policies that are unsupported in meta tag