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

Merge branch 'master' into mark-for-deletion-issue-1657

Browse source
This commit is contained in:
the-djmaze 2024-07-14 23:09:48 +02:00
commit d7bf80ea79
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
View file

@ -45,7 +45,7 @@ abstract class Account implements \JsonSerializable
public function SmtpUser() : string public function SmtpUser() : string
{ {
return $this->sSmtpUser ?: $this->oDomain->SmtpSettings()->fixUsername($this->sEmail); return $this->sSmtpUser ?: ($this->oDomain ? $this->oDomain->SmtpSettings()->fixUsername($this->sEmail) : '');
// return $this->sSmtpUser ?: $this->sEmail ?: $this->sImapUser; // return $this->sSmtpUser ?: $this->sEmail ?: $this->sImapUser;
} }