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

(-)a/C4/Letters.pm (-4 / +31 lines)
Lines 1532-1537 sub _send_message_by_email { Link Here
1532
        );
1532
        );
1533
        return;
1533
        return;
1534
    }
1534
    }
1535
1536
    my $bcc_address = C4::Context->preference('NoticeBcc');
1537
1538
    if (    C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1539
        and C4::Context->preference('EmailRecipientField') eq "cc" )
1540
    {
1541
        $cc_address = $cc_address ? join( ',', $cc_address, $to_address ) : $to_address;
1542
        _update_message_cc_address( $message->{'message_id'}, $cc_address );
1543
        if ($count_guarantor_address) {
1544
            $to_address = shift @guarantor_address;
1545
        } else {
1546
            my @to_address = split( ',', $to_address );
1547
            $to_address = shift @to_address;
1548
        }
1549
        _update_message_to_address( $message->{'message_id'}, $to_address );
1550
    } elsif ( C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1551
        and C4::Context->preference('EmailRecipientField') eq "bcc" )
1552
    {
1553
        $bcc_address = $bcc_address ? join( ',', $bcc_address, $to_address ) : $to_address;
1554
        if ($count_guarantor_address) {
1555
            $to_address = shift @guarantor_address;
1556
        } else {
1557
            my @to_address = split( ',', $to_address );
1558
            $to_address = shift @to_address;
1559
        }
1560
        _update_message_to_address( $message->{'message_id'}, $to_address );
1561
    }
1562
1535
    my $email;
1563
    my $email;
1536
1564
1537
    try {
1565
    try {
Lines 1539-1546 sub _send_message_by_email { Link Here
1539
        my $params = {
1567
        my $params = {
1540
            to => $to_address,
1568
            to => $to_address,
1541
            (
1569
            (
1542
                C4::Context->preference('NoticeBcc')
1570
                $bcc_address
1543
                ? ( bcc => C4::Context->preference('NoticeBcc') )
1571
                ? ( bcc => $bcc_address )
1544
                : ()
1572
                : ()
1545
            ),
1573
            ),
1546
            (
1574
            (
Lines 1557-1563 sub _send_message_by_email { Link Here
1557
                ? ( template_id => $message->{letter_id} )
1585
                ? ( template_id => $message->{letter_id} )
1558
                : ()
1586
                : ()
1559
            ),
1587
            ),
1560
            message_id => $message->{id}
1588
            message_id => $message->{message_id}
1561
        };
1589
        };
1562
1590
1563
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1591
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1564
- 

Return to bug 37598