From 28d1eda94a3d1658fadecfbb9861641f42c80cf9 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Tue, 6 Nov 2018 15:02:47 +0100
Subject: [PATCH] Bug 21771: (follow-up) Revert the shift statement

Obviously you should never shift an items from an array if you need that
item later on :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with entering userid as well as entering email..

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1885e6a2146dfab4784e3d9560161d5f097cfcae)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 opac/opac-password-recovery.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/opac/opac-password-recovery.pl b/opac/opac-password-recovery.pl
index 7fa011c137..06304789c5 100755
--- a/opac/opac-password-recovery.pl
+++ b/opac/opac-password-recovery.pl
@@ -76,7 +76,8 @@ if ( $query->param('sendEmail') || $query->param('resendEmail') ) {
     elsif ( $borrower = $search_results->next() ) {    # One matching borrower
         my @emails = grep { $_ } ( $borrower->email, $borrower->emailpro, $borrower->B_email );
 
-        my $firstNonEmptyEmail = shift @emails;
+        my $firstNonEmptyEmail;
+        $firstNonEmptyEmail = $emails[0] if @emails;
 
         # Is the given email one of the borrower's ?
         if ( $email && !( grep /^$email$/i, @emails ) ) {
-- 
2.39.5