Bugzilla – Attachment 122075 Details for
Bug 28581
Patron's queue_notice uses inbound_email_address incorrectly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28581: (QA follow-up) Prevent code failure
Bug-28581-QA-follow-up-Prevent-code-failure.patch (text/plain), 1.42 KB, created by
Martin Renvoize (ashimema)
on 2021-06-17 13:37:54 UTC
(
hide
)
Description:
Bug 28581: (QA follow-up) Prevent code failure
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-06-17 13:37:54 UTC
Size:
1.42 KB
patch
obsolete
>From d1fe5cef3e0ac25bd8b6b6fb9c451a1a51368938 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >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 <m.de.rooy@rijksmuseum.nl> >--- > C4/Letters.pm | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 98dfda4a40..7637302785 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -1365,12 +1365,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.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28581
:
122056
|
122057
|
122061
|
122062
|
122063
|
122067
|
122068
|
122071
|
122072
|
122073
|
122074
|
122075
|
122076
|
122078
|
122080
|
122081
|
122136
|
122137
|
122138
|
122139
|
122140
|
122212