From c4113dce705a700acf1d7d271a044d1f555d7c81 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 13 Sep 2017 03:44:19 +0000 Subject: [PATCH] Bug 18956: Fix empty to in message queue Follow the test plan in comment #20. Also tweaked string, because it was really 'or' before too. Signed-off-by: Marcel de Rooy Amended text in added comment. Signed-off-by: Jonathan Druart --- .../opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt | 2 +- opac/opac-password-recovery.pl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt index fd5145b302..c9beb40a52 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt @@ -89,7 +89,7 @@
-

To reset your password, enter your login and your email address. +

To reset your password, enter your login or your email address. diff --git a/opac/opac-password-recovery.pl b/opac/opac-password-recovery.pl index 648c40758e..456aa97ff5 100755 --- a/opac/opac-password-recovery.pl +++ b/opac/opac-password-recovery.pl @@ -104,6 +104,10 @@ if ( $query->param('sendEmail') || $query->param('resendEmail') ) { DeleteExpiredPasswordRecovery( $borrower->borrowernumber ); } } + # Set the $email, if we don't have one. + if ( !$hasError && !$email ) { + $email = $firstNonEmptyEmail; + } } else { # 0 matching borrower $hasError = 1; -- 2.39.5