Merge remote-tracking branch 'origin/new/bug_7453'

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index ff1fecf..a88bffb 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -124,7 +124,7 @@ my @bordat;
 $bordat[0] = $borr;
 
 # Warningdate is the date that the warning starts appearing
-if ( C4::Context->preference('NotifyBorrowerDeparture') &&
+if ( $borr->{dateexpiry} && C4::Context->preference('NotifyBorrowerDeparture') &&
     Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
     Date_to_Days( $today_year, $today_month, $today_day ) ) 
 {