@@ -, +, @@ --- Koha/Patron.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) mode change 100644 => 100755 Koha/Patron.pm --- a/Koha/Patron.pm +++ a/Koha/Patron.pm @@ -1028,6 +1028,7 @@ Returns the empty string if no email address. sub notice_email_address{ my ( $self ) = @_; my $address; + my $guarantor_address; my $which_address = C4::Context->preference("AutoEmailPrimaryAddress"); # if syspref is set to 'first valid' (value == OFF), look up email address @@ -1041,11 +1042,15 @@ sub notice_email_address{ if ($use_guarantor) { my $guarantor = $self->guarantor; if ($guarantor) { - my $guarantor_address = $guarantor->notice_email_address; + if ( $which_address eq 'OFF' ) { + $guarantor_address = $guarantor->first_valid_email_address; + } else { + $guarantor_address = $guarantor->$which_address || ''; + } if ($address){ - $address .= ', '; + $address .= ', '; } - $address .= $guarantor_address if $guarantor_address; + $address .= $guarantor_address if $guarantor_address; } } return $address; --