From f6ed69c4e34becb2c040d7171ad7926d09989929 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 10 Mar 2023 10:47:51 +0000 Subject: [PATCH] Bug 29046: Use EmailFieldPrecidence in first_valid_email_address This patch update the Koha::Patron->first_valid_email_address method to use the newly defined EmailFieldPrecidence preference. --- Koha/Patron.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Koha/Patron.pm b/Koha/Patron.pm index 9282b38307..41a20ba57d 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -1422,7 +1422,15 @@ Returns the empty string if the borrower has no email addresses. sub first_valid_email_address { my ($self) = @_; - return $self->email() || $self->emailpro() || $self->B_email() || q{}; + my $email == q{}; + + my @fields = split /\s*\|\s*/, C4::Context->preference('EmailFieldPrecidence'); + for my $field ( @fields ) { + $email = $self->$field; + last if ($email ne q{}); + } + + return $email; } =head3 get_club_enrollments -- 2.39.2