From 636caec269e471cced4fb15e0cc7f7eeca83bc8f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 17 Nov 2020 16:07:51 +0100 Subject: [PATCH] Bug 26922: Correctly handle email sending error from SendAlerts --- C4/Letters.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index d3e354f6c6..94d5cf7b00 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -357,13 +357,15 @@ sub SendAlerts { $mail->text_body( $letter->{content} ); } + my $error; try { $mail->send_or_die({ transport => $library->smtp_server->transport }); } catch { carp "$_"; - return { error => "$_" }; + $error = $_; }; + return { error => $error } if $error; } } elsif ( $type eq 'claimacquisition' or $type eq 'claimissues' or $type eq 'orderacquisition' ) { @@ -511,13 +513,15 @@ sub SendAlerts { $mail->text_body( "" . $letter->{content} ); } + my $error; try { $mail->send_or_die({ transport => $library->smtp_server->transport }); } catch { carp "$_"; - return { error => "$_" }; + $error = $_; }; + return { error => $error } if $error; logaction( "ACQUISITION", -- 2.20.1