Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 28581: (QA follow-up) Prevent code failure

Browse source 
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 <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Martin Renvoize 2021-06-17 14:12:23 +01:00 committed by Jonathan Druart
parent fdf75e4cb0
commit 7c6575e86a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
C4/Letters.pm
View file

@ -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'},