From f0263dc5e1a61e93c3869b834bf7b4e01cdc5b99 Mon Sep 17 00:00:00 2001 From: oheil Date: Sat, 4 Mar 2023 15:45:45 +0100 Subject: [PATCH] regression bug from release 1.9.12 --- webmail/classes/nocc_languages.php | 3 +-- webmail/common.php | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/webmail/classes/nocc_languages.php b/webmail/classes/nocc_languages.php index c794b80..3a8acd4 100644 --- a/webmail/classes/nocc_languages.php +++ b/webmail/classes/nocc_languages.php @@ -10,7 +10,7 @@ * * @package NOCC * @license http://www.gnu.org/licenses/ GNU General Public License - * @version SVN: $Id: nocc_languages.php 3016 2022-08-25 11:00:42Z oheil $ + * @version SVN: $Id: nocc_languages.php 3057 2023-03-04 14:45:24Z oheil $ */ /** @@ -56,7 +56,6 @@ class NOCC_Languages { $path .= '/'; } - $this->_languages["default"]=convertLang2Html($html_default); //TODO: Move some code to a NOCC_Directory class? if ($handle = opendir($path)) { //if can open the directory... while (false !== ($name = readdir($handle))) { //for each item... diff --git a/webmail/common.php b/webmail/common.php index 661eadc..d5b0c6a 100644 --- a/webmail/common.php +++ b/webmail/common.php @@ -11,7 +11,7 @@ * * @package NOCC * @license http://www.gnu.org/licenses/ GNU General Public License - * @version SVN: $Id: common.php 3052 2023-02-28 10:40:12Z oheil $ + * @version SVN: $Id: common.php 3057 2023-03-04 14:45:24Z oheil $ */ define('NOCC_DEBUG_LEVEL', 0); @@ -57,7 +57,7 @@ require_once './utils/crypt.php'; require_once './utils/translation.php'; $conf->nocc_name = 'NOCC'; -$conf->nocc_version = '1.9.12'; +$conf->nocc_version = '1.9.13-dev'; $conf->nocc_url = 'http://nocc.sourceforge.net/'; $pwd_to_encrypt = false; @@ -137,7 +137,7 @@ if (isset($_REQUEST['lang'])) { //if a language is requested... } } -if( isset($_SESSION['nocc_lang']) && $_SESSION['nocc_lang']!="default" ) { //if session language already set... +if( isset($_SESSION['nocc_lang']) && $_SESSION['nocc_lang'] != "default" ) { //if session language already set... $languages->setSelectedLangId($_SESSION['nocc_lang']); } else { //if session language NOT already set... @@ -152,7 +152,7 @@ else { //if session language NOT already set... $languages->setSelectedLangId('en'); } } - if( $_SESSION['nocc_lang']!="default" ) { + if( ! isset($_SESSION['nocc_lang']) || $_SESSION['nocc_lang'] != "default" ) { $_SESSION['nocc_lang'] = $languages->getSelectedLangId(); } }