Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #205 only when 'Language' setting is empty

Browse source
This commit is contained in:
the-djmaze 2022-02-14 12:56:57 +01:00
parent af959e3631
commit b405b45158
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -848,11 +848,13 @@ class Actions
$aResult['ReplySameFolder'] = (bool)$oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']); $aResult['ReplySameFolder'] = (bool)$oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
} }
if ($oConfig->Get('login', 'determine_user_language', true)) {
$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
}
if ($oSettings instanceof Settings) { if ($oSettings instanceof Settings) {
if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) { if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) {
$sLanguage = (string)$oSettings->GetConf('Language', $sLanguage = (string) $oSettings->GetConf('Language', $sLanguage);
$oConfig->Get('login', 'determine_user_language', true) ? $UserLanguageRaw : $sLanguage
);
} }
$aResult['EditorDefaultType'] = (string)$oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']); $aResult['EditorDefaultType'] = (string)$oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']);