Merge pull request #4670 from IgorA100/patch-64749

Chore: Optimized saving of "navbar_type" in session and cookies (index.php)
pull/4667/head^2
Isaac Connor 2026-03-04 14:45:42 -05:00 committed by GitHub
commit 58cfcc4960
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions

View File

@ -178,14 +178,13 @@ if (
zm_setcookie('zmCSS', $css);
}
if (
!isset($_SESSION['navbar_type']) ||
isset($_REQUEST['navbar_type']) ||
!isset($_COOKIE['zmNavbar_type']) ||
($_COOKIE['zmNavbar_type'] != $navbar_type)
) {
$_SESSION['navbar_type'] = $navbar_type;
zm_setcookie('zmNavbar_type', $navbar_type);
if (!defined('ZM_FORCE_NAVBAR_TYPE')) {
if (!isset($_COOKIE['zmNavbar_type']) || $_COOKIE['zmNavbar_type'] != $navbar_type) {
zm_setcookie('zmNavbar_type', $navbar_type);
}
if (!isset($_SESSION['navbar_type']) || $_SESSION['navbar_type'] != $navbar_type) {
$_SESSION['navbar_type'] = $navbar_type;
}
}
# Add Cross domain access headers