Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #1180

Browse source
This commit is contained in:
the-djmaze 2023-06-19 16:38:00 +02:00
parent 0f5e16f7d8
commit 954a86b23d
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -676,7 +676,6 @@ class Actions
'Email' => \MailSo\Base\Utils::IdnToUtf8($oAccount->Email()),
'accountHash' => $oAccount->Hash(),
'accountSignMe' => isset($_COOKIE[self::AUTH_SIGN_ME_TOKEN_KEY]),
'mainEmail' => \MailSo\Base\Utils::IdnToUtf8($this->getMainAccountFromToken()->Email()),
'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),

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

@ -200,8 +200,7 @@ trait Accounts
$aResult = [
'Email' => $oAccount->Email(),
'accountHash' => $oAccount->Hash(),
'mainEmail' => ($oAccount instanceof AdditionalAccount)
? $oAccount->ParentEmail() : '',
'mainEmail' => \RainLoop\Api::Actions()->getMainAccountFromToken()->Email(),
'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
'HideUnsubscribed' => false,
'UseThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false),