From 7c6575e86a87b40c9a82d17ea928ffea066cefc7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 17 Jun 2021 14:12:23 +0100 Subject: [PATCH] Bug 28581: (QA follow-up) Prevent code failure This patch prevents a fatal error when both $params->{from} and $params->{borrowernumber} are undefined. We fallback to KohaAdminEmailAddress before finally falling through to setting a failure status for the message if that last fallback is not found. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- C4/Letters.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index 877d139321..fd04448941 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -1343,12 +1343,15 @@ sub _send_message_by_email { if ($patron) { $library = $patron->library; - $branch_email = $library->branchemail; + $branch_email = $library->from_email_address; $branch_replyto = $library->branchreplyto; $branch_returnpath = $library->branchreturnpath; } - my $from_address = $message->{'from_address'} || $library->from_email_address; + my $from_address = + $message->{'from_address'} + || $branch_email + || C4::Context->preference('KohaAdminEmailAddress'); if( !$from_address ) { _set_message_status({ message_id => $message->{'message_id'}, -- 2.39.5