From a0b6bcfd55c0bdfc45f229ea5cc6373cece24432 Mon Sep 17 00:00:00 2001 From: David Kuhn Date: Sat, 10 Jun 2017 13:08:20 -0700 Subject: [PATCH] Bug 18775 - The "Password Reset" notice should use the patron's homebranch's email as "from" address To test: 1. Enable the password recovery feature. 2. In the OPAC, click on "Forgot you password?" link and enter requested information. 3. The email with the password reset link has the Koha Admin Email Address listed as the sender. 4. Apply the patch. 5. Repeat step 2. The email with the password reset link now has the the "from" address set for the patron's home branch listed as the sender. Signed-off-by: Jessica Freeman Signed-off-by: Jonathan Druart --- Koha/Patron/Password/Recovery.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Koha/Patron/Password/Recovery.pm b/Koha/Patron/Password/Recovery.pm index a23a609b90..a7002336ae 100644 --- a/Koha/Patron/Password/Recovery.pm +++ b/Koha/Patron/Password/Recovery.pm @@ -148,8 +148,9 @@ sub SendPasswordRecoveryEmail { { passwordreseturl => $uuidLink, user => $borrower->userid }, ); - # define to/from emails - my $kohaEmail = C4::Context->preference('KohaAdminEmailAddress'); # from + # define from emails + my $library = Koha::Libraries->find( $borrower->branchcode ); + my $kohaEmail = $library->branchemail || C4::Context->preference('KohaAdminEmailAddress'); # send from patron's branch or Koha Admin C4::Letters::EnqueueLetter( { -- 2.11.0