From ebbf9fa84ac5b7d9ebfb015b0e2a6e0068cf5409 Mon Sep 17 00:00:00 2001 From: blake Date: Mon, 17 Feb 2020 09:10:17 -0600 Subject: [PATCH] LP1532236 Evergreen should allow for HTML formatted action trigger emails Simple fix for allowing the AT template to drive the email headers instead of replacing the headers blindly. Kudos to tsbere for the unless idea. Testing: setup an action trigger for SendEmail. Make sure your AT template includes an email header (EG: Content-Type: text/html;charset=utf-8) Setup a hold/circulation that meets the criteria of your action trigger. Check the resuting email's headers to match what you had put into the template. Signed-off-by: blake Signed-off-by: Garry Collum Signed-off-by: Jane Sandberg --- .../perlmods/lib/OpenILS/Application/Trigger/Reactor/SendEmail.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/SendEmail.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/SendEmail.pm index 17cca23822..71354e6b65 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/SendEmail.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/SendEmail.pm @@ -90,9 +90,9 @@ sub handler { my @headers = $email->header('Subject'); $email->header_str_set('Subject' => decode_utf8($headers[0])) if ($headers[0]); - $email->header_set('MIME-Version' => '1.0'); - $email->header_set('Content-Type' => "text/plain; charset=UTF-8"); - $email->header_set('Content-Transfer-Encoding' => '8bit'); + $email->header_set('MIME-Version' => '1.0') unless $email->header('MIME-Version'); + $email->header_set('Content-Type' => "text/plain; charset=UTF-8") unless $email->header('Content-Type'); + $email->header_set('Content-Transfer-Encoding' => '8bit') unless $email->header('Content-Transfer-Encoding'); try { $stat = $sender->send($email); -- 2.11.0