Attachment 100518 Details for Bug 4461 – Bug 4461: Drop 'from_address' use 'reply_address'

[patch] Bug 4461: Drop 'from_address' use 'reply_address'

Bug-4461-Drop-fromaddress-use-replyaddress.patch (text/plain), 2.13 KB, created by Martin Renvoize (ashimema) on 2020-03-11 09:12:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-03-11 09:12:41 UTC

Size: 2.13 KB

patch

obsolete

>From 73b93b833f2b867ba7bd8b7e341de34765d98c7e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 2 Mar 2020 15:16:37 +0000
>Subject: [PATCH] Bug 4461: Drop 'from_address' use 'reply_address'
>
>This patch adds support for using the reply-to field added in bug 10269
>and drops 'from_address' as it will get defined at a later stage in the
>emailing process anyway.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> opac/opac-reportproblem.pl | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> mode change 100644 => 100755 opac/opac-reportproblem.pl
>
>diff --git a/opac/opac-reportproblem.pl b/opac/opac-reportproblem.pl
>old mode 100644
>new mode 100755
>index c8e0d2a22a..fa6171bf36
>--- a/opac/opac-reportproblem.pl
>+++ b/opac/opac-reportproblem.pl
>@@ -94,8 +94,8 @@ if ( $op eq 'addreport' ) {
>                     }
>                 );
> 
>-                my $from_address = C4::Context->preference('KohaAdminEmailAddress');
>                 my $transport = 'email';
>+                my $reply_address = $patron->email || $patron->emailpro || $patron->B_email;
> 
>                 if ( $recipient eq 'admin' ) {
>                     C4::Letters::EnqueueLetter({
>@@ -103,7 +103,7 @@ if ( $op eq 'addreport' ) {
>                         borrowernumber         => $borrowernumber,
>                         message_transport_type => $transport,
>                         to_address             => C4::Context->preference('KohaAdminEmailAddress'),
>-                        from_address           => $from_address,
>+                        reply_address          => $reply_address,
>                     });
>                 } else {
>                     C4::Letters::EnqueueLetter({
>@@ -111,7 +111,7 @@ if ( $op eq 'addreport' ) {
>                         borrowernumber         => $borrowernumber,
>                         message_transport_type => $transport,
>                         to_address             => $library->branchemail,
>-                        from_address           => $from_address,
>+                        reply_address          => $reply_address,
>                     });
>                 }
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 4461: 58887 | 59032 | 61654 | 65871 | 66253 | 66323 | 66324 | 98687 | 98688 | 98689 | 98725 | 99551 | 99599 | 99600 | 99601 | 99602 | 99603 | 99633 | 99635 | 99636 | 99637 | 99638 | 99639 | 99929 | 99930 | 99931 | 99932 | 99933 | 99934 | 99935 | 99936 | 99937 | 99938 | 99939 | 99940 | 99941 | 99942 | 100488 | 100489 | 100490 | 100491 | 100492 | 100493 | 100494 | 100495 | 100496 | 100497 | 100498 | 100499 | 100500 | 100506 | 100507 | 100508 | 100509 | 100510 | 100511 | 100512 | 100513 | 100514 | 100515 | 100516 | 100517 | 100518 | 100519 | 100520 | 100521 | 100522 | 100523 | 100524 | 100619 | 100989 | 100990 | 102188 | 102189 | 102190 | 102191 | 102192 | 102193 | 102194 | 102195 | 102196 | 102198 | 102200 | 102201 | 102202 | 102203 | 102204 | 102205 | 102206 | 102207 | 102208 | 102209 | 102210 | 102211 | 102253 | 102279 | 102281 | 102308 | 102309 | 102310 | 102311 | 102312 | 102313 | 102314 | 102315 | 102316 | 102317 | 102318 | 102319 | 102320 | 102321 | 102322 | 102323 | 102324 | 102325 | 102326 | 102327 | 102328 | 102329 | 102330 | 102331 | 102358 | 102359 | 102360 | 102361 | 102362 | 102363 | 102364 | 102365 | 102366 | 102367 | 102368 | 102369 | 102370 | 102371 | 102372 | 102373 | 102374 | 102375 | 102376 | 102377 | 102378 | 102379 | 102380 | 102381 | 102382 | 102383 | 102384 | 102385 | 102386