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

This commit is contained in:
the-djmaze 2024-07-14 23:09:48 +02:00
commit d7bf80ea79

View file

@ -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;
}