@@ -, +, @@ - remove 'use Koha::Patrons' defined twice - remove vars $errTooManyEmailFound $errBadEmail, not used in any template - add in template text for error 'errNoBorrowerEmail' --- .../bootstrap/en/modules/opac-password-recovery.tt | 2 ++ opac/opac-password-recovery.pl | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt @@ -84,6 +84,8 @@ [% ELSIF (errMultipleAccountsForEmail) %] Account identification with this email address only is ambiguous.
Please use the field 'Login' as well. + [% ELSIF (errNoBorrowerEmail) %] + This account has no email address we can send the email to. [% ELSIF (errAlreadyStartRecovery) %] The process of password recovery has already been started for this account [% IF username %] --- a/opac/opac-password-recovery.pl +++ a/opac/opac-password-recovery.pl @@ -10,7 +10,6 @@ use C4::Context; use Koha::Patron::Password::Recovery qw(SendPasswordRecoveryEmail ValidateBorrowernumber GetValidLinkInfo CompletePasswordRecovery DeleteExpiredPasswordRecovery); use Koha::Patrons; -use Koha::Patrons; my $query = CGI->new; use HTML::Entities; use Try::Tiny; @@ -42,8 +41,6 @@ my $errNoBorrowerFound; my $errNoBorrowerEmail; my $errMultipleAccountsForEmail; my $errAlreadyStartRecovery; -my $errTooManyEmailFound; -my $errBadEmail; my $errResetForbidden; #new password form error @@ -123,11 +120,8 @@ if ( $query->param('sendEmail') || $query->param('resendEmail') ) { if ($hasError) { $template->param( hasError => 1, - errNoBorrowerFound => $errNoBorrowerFound, - errTooManyEmailFound => $errTooManyEmailFound, errAlreadyStartRecovery => $errAlreadyStartRecovery, - errBadEmail => $errBadEmail, errNoBorrowerEmail => $errNoBorrowerEmail, errMultipleAccountsForEmail => $errMultipleAccountsForEmail, errResetForbidden => $errResetForbidden, --