From 7d493c32877b16464a377da92f48a41a570d31c1 Mon Sep 17 00:00:00 2001 From: frytimo Date: Fri, 28 Jun 2024 11:47:17 -0300 Subject: [PATCH] smtp_from_name was accidentally set to smtp_from (#7029) This uses the settings default value to set smtp_from_name to be set to smtp_from if it does not have it's own value. The isset check on line 248 is no longer needed because smtp_from_name will always have a value --- app/email_queue/resources/command/send.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/email_queue/resources/command/send.php b/app/email_queue/resources/command/send.php index b14a3e5746..9909afb196 100644 --- a/app/email_queue/resources/command/send.php +++ b/app/email_queue/resources/command/send.php @@ -155,7 +155,7 @@ //get the email queue settings $setting = new settings(["domain_uuid" => $domain_uuid]); $smtp_from = $setting->get('email', 'smtp_from'); - $smtp_from_name = $setting->get('email', 'smtp_from'); + $smtp_from_name = $setting->get('email', 'smtp_from_name', $smtp_from); $save_response = $setting->get('email_queue', 'save_response'); //debug information @@ -246,9 +246,7 @@ $email->subject = $email_subject; $email->body = $email_body; $email->from_address = $smtp_from; - if (isset($smtp_from_name)) { - $email->from_name = $smtp_from_name; - } + $email->from_name = $smtp_from_name; if (isset($email_attachments)) { $email->attachments = $email_attachments; }