Fix unset `SMTP_RETURN_PATH` environment variable causing e-mail not to send (#17982)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index b003cce9ed6c258986a0fd8d80abb409787a1ae1..95f8a6f32a63dcca38ad90e09fc5f276fcb57670 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -95,11 +95,12 @@ Rails.application.configure do
 
   config.action_mailer.default_options = {
     from: outgoing_email_address,
-    reply_to: ENV['SMTP_REPLY_TO'],
-    return_path: ENV['SMTP_RETURN_PATH'],
     message_id: -> { "<#{Mail.random_tag}@#{outgoing_email_domain}>" },
   }
 
+  config.action_mailer.default_options[:reply_to]    = ENV['SMTP_REPLY_TO'] if ENV['SMTP_REPLY_TO'].present?
+  config.action_mailer.default_options[:return_path] = ENV['SMTP_RETURN_PATH'] if ENV['SMTP_RETURN_PATH'].present?
+
   config.action_mailer.smtp_settings = {
     :port                 => ENV['SMTP_PORT'],
     :address              => ENV['SMTP_SERVER'],