From c5bb4d6529f9dcd2457639c8b7735dfc7001d244 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 21 Sep 2018 11:38:15 +0200 Subject: [PATCH] Bug 20023: (QA follow-up) Tiny simplification Remove empty emails from the list rightaway. Would be tempted to lc the params->{email} at the start btw.. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit eec74a2cd1847a859b4fab37c42882ba192ee560) Signed-off-by: Martin Renvoize --- opac/opac-password-recovery.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/opac/opac-password-recovery.pl b/opac/opac-password-recovery.pl index b65eb792b1..7fa011c137 100755 --- a/opac/opac-password-recovery.pl +++ b/opac/opac-password-recovery.pl @@ -74,13 +74,9 @@ if ( $query->param('sendEmail') || $query->param('resendEmail') ) { $errMultipleAccountsForEmail = 1; } elsif ( $borrower = $search_results->next() ) { # One matching borrower - my @emails = ( $borrower->email || '', $borrower->emailpro || '', $borrower->B_email || ''); + my @emails = grep { $_ } ( $borrower->email, $borrower->emailpro, $borrower->B_email ); - my $firstNonEmptyEmail = ''; - foreach my $address ( @emails ) { - $firstNonEmptyEmail = $address if length $address; - last if $firstNonEmptyEmail; - } + my $firstNonEmptyEmail = shift @emails; # Is the given email one of the borrower's ? if ( $email && !( grep /^$email$/i, @emails ) ) { -- 2.39.5