diff --git a/web/index.php b/web/index.php index 9bc6ef3ba..cbab6bf72 100644 --- a/web/index.php +++ b/web/index.php @@ -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