Merge branch 'master' into floc

This commit is contained in:
El RIDO 2021-04-17 08:35:21 +02:00
commit 9b893f09d7
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
7 changed files with 8 additions and 7 deletions

View file

@ -170,7 +170,7 @@ class Controller
// force default language, if language selection is disabled and a default is set
if (!$this->_conf->getKey('languageselection') && strlen($lang) == 2) {
$_COOKIE['lang'] = $lang;
setcookie('lang', $lang);
setcookie('lang', $lang, 0, '', '', true);
}
}
@ -368,7 +368,7 @@ class Controller
$languageselection = '';
if ($this->_conf->getKey('languageselection')) {
$languageselection = I18n::getLanguage();
setcookie('lang', $languageselection);
setcookie('lang', $languageselection, 0, '', '', true);
}
$page = new View;