Merge commit 'kc/master'

[koha.git] / C4 / Letters.pm

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 47abf6c..3f634e1 100644 (file)
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -803,7 +803,12 @@ sub _send_message_by_email ($;$$$) {
             return;
         }
         my $which_address = C4::Context->preference('AutoEmailPrimaryAddress');
-        $to_address = $member->{$which_address};
+        # If the system preference is set to 'first valid' (value == OFF), look up email address
+        if ($which_address eq 'OFF') {
+            $to_address = GetFirstValidEmailAddress( $message->{'borrowernumber'} );
+        } else {
+            $to_address = $member->{$which_address};
+        }
         unless ($to_address) {  
             # warn "FAIL: No 'to_address' and no email for " . ($member->{surname} ||'') . ", borrowernumber ($message->{borrowernumber})";
             # warning too verbose for this more common case?