mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-11-10 09:02:45 +08:00
Merge branch 'master' into mark-for-deletion-issue-1657
This commit is contained in:
commit
d7bf80ea79
1 changed files with 1 additions and 1 deletions
|
@ -45,7 +45,7 @@ abstract class Account implements \JsonSerializable
|
|||
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue