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

(-)a/C4/Letters.pm (-2 / +4 lines)
Lines 945-953 sub _send_message_by_email { Link Here
945
    my $content = encode('utf8', $message->{'content'});
945
    my $content = encode('utf8', $message->{'content'});
946
    my $content_type = $message->{'content_type'} || 'text/plain; charset="UTF-8"';
946
    my $content_type = $message->{'content_type'} || 'text/plain; charset="UTF-8"';
947
    my $is_html = $content_type =~ m/html/io;
947
    my $is_html = $content_type =~ m/html/io;
948
949
    my $branch_email = ( $member ) ? GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} : undef;
950
948
    my %sendmail_params = (
951
    my %sendmail_params = (
949
        To   => $to_address,
952
        To   => $to_address,
950
        From => $message->{'from_address'} || GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress'),
953
        From => $message->{'from_address'} || $branch_email || C4::Context->preference('KohaAdminEmailAddress'),
951
        Subject => $subject,
954
        Subject => $subject,
952
        charset => 'utf8',
955
        charset => 'utf8',
953
        Message => $is_html ? _wrap_html($content, $subject) : $content,
956
        Message => $is_html ? _wrap_html($content, $subject) : $content,
954
- 

Return to bug 5544