From 26402293614301a273300bd8afd6afa2c55640b5 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 19 Jan 2018 13:41:20 -0300
Subject: [PATCH] Bug 19287: Fix conflict with bug 19304
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 circ/pendingreserves.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 2e1612f8a9..72aba665c1 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -92,7 +92,7 @@ if ( $op eq 'cancel_reserve' and $reserve_id ) {
                         from_address           => $admin_email_address,
                     }
                 );
-                unless ( C4::Members::GetNoticeEmailAddress( $patron->borrowernumber ) ) {
+                unless ( $patron->notice_email_address ) {
                     push @messages, {type => 'alert', code => 'no_email_address', };
                 }
                 push @messages, { type => 'message', code => 'letter_enqueued' };
-- 
2.39.5