View | Details | Raw Unified | Return to bug 5544
Collapse All | Expand All

(-)a/C4/Letters.pm (-4 / +3 lines)
Lines 912-920 sub _send_message_by_email { Link Here
912
    my $message = shift or return;
912
    my $message = shift or return;
913
    my ($username, $password, $method) = @_;
913
    my ($username, $password, $method) = @_;
914
914
915
    my $to_address = $message->{to_address};
915
    my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} );
916
    my $to_address = $message->{'to_address'};
916
    unless ($to_address) {
917
    unless ($to_address) {
917
        my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} );
918
        unless ($member) {
918
        unless ($member) {
919
            warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})";
919
            warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})";
920
            _set_message_status( { message_id => $message->{'message_id'},
920
            _set_message_status( { message_id => $message->{'message_id'},
Lines 939-945 sub _send_message_by_email { Link Here
939
    my $is_html = $content_type =~ m/html/io;
939
    my $is_html = $content_type =~ m/html/io;
940
    my %sendmail_params = (
940
    my %sendmail_params = (
941
        To   => $to_address,
941
        To   => $to_address,
942
        From => $message->{'from_address'} || C4::Context->preference('KohaAdminEmailAddress'),
942
        From => $message->{'from_address'} || GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress'),
943
        Subject => $subject,
943
        Subject => $subject,
944
        charset => 'utf8',
944
        charset => 'utf8',
945
        Message => $is_html ? _wrap_html($content, $subject) : $content,
945
        Message => $is_html ? _wrap_html($content, $subject) : $content,
946
- 

Return to bug 5544