mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Only set DevEmail/DevPassword when version is 0.0.0
This commit is contained in:
parent
6215af5d74
commit
765150c19a
1 changed files with 4 additions and 3 deletions
|
|
@ -895,8 +895,10 @@ class Actions
|
||||||
$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
|
$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ('0.0.0' === APP_VERSION) {
|
||||||
$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
|
$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
|
||||||
$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
|
$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
|
||||||
|
}
|
||||||
|
|
||||||
if (empty($aResult['AdditionalLoginError'])) {
|
if (empty($aResult['AdditionalLoginError'])) {
|
||||||
$aResult['AdditionalLoginError'] = $this->GetSpecLogoutCustomMgsWithDeletion();
|
$aResult['AdditionalLoginError'] = $this->GetSpecLogoutCustomMgsWithDeletion();
|
||||||
|
|
@ -937,7 +939,6 @@ class Actions
|
||||||
// IDN
|
// IDN
|
||||||
$aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']);
|
$aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']);
|
||||||
$aResult['MailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['MailToEmail']);
|
$aResult['MailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['MailToEmail']);
|
||||||
$aResult['DevEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['DevEmail']);
|
|
||||||
|
|
||||||
$this->oPlugins->InitAppData($bAdmin, $aResult, $oAccount);
|
$this->oPlugins->InitAppData($bAdmin, $aResult, $oAccount);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue