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

(-)a/C4/Letters.pm (-4 / +31 lines)
Lines 1516-1521 sub _send_message_by_email { Link Here
1516
        );
1516
        );
1517
        return;
1517
        return;
1518
    }
1518
    }
1519
1520
    my $bcc_address = C4::Context->preference('NoticeBcc');
1521
1522
    if (    C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1523
        and C4::Context->preference('EmailRecipientField') eq "cc" )
1524
    {
1525
        $cc_address = $cc_address ? join( ',', $cc_address, $to_address ) : $to_address;
1526
        _update_message_cc_address( $message->{'message_id'}, $cc_address );
1527
        if ($count_guarantor_address) {
1528
            $to_address = shift @guarantor_address;
1529
        } else {
1530
            my @to_address = split( ',', $to_address );
1531
            $to_address = shift @to_address;
1532
        }
1533
        _update_message_to_address( $message->{'message_id'}, $to_address );
1534
    } elsif ( C4::Context->preference('EmailFieldPrimary') eq "MULTI"
1535
        and C4::Context->preference('EmailRecipientField') eq "bcc" )
1536
    {
1537
        $bcc_address = $bcc_address ? join( ',', $bcc_address, $to_address ) : $to_address;
1538
        if ($count_guarantor_address) {
1539
            $to_address = shift @guarantor_address;
1540
        } else {
1541
            my @to_address = split( ',', $to_address );
1542
            $to_address = shift @to_address;
1543
        }
1544
        _update_message_to_address( $message->{'message_id'}, $to_address );
1545
    }
1546
1519
    my $email;
1547
    my $email;
1520
1548
1521
    try {
1549
    try {
Lines 1523-1530 sub _send_message_by_email { Link Here
1523
        my $params = {
1551
        my $params = {
1524
            to => $to_address,
1552
            to => $to_address,
1525
            (
1553
            (
1526
                C4::Context->preference('NoticeBcc')
1554
                $bcc_address
1527
                ? ( bcc => C4::Context->preference('NoticeBcc') )
1555
                ? ( bcc => $bcc_address )
1528
                : ()
1556
                : ()
1529
            ),
1557
            ),
1530
            (
1558
            (
Lines 1541-1547 sub _send_message_by_email { Link Here
1541
                ? ( template_id => $message->{letter_id} )
1569
                ? ( template_id => $message->{letter_id} )
1542
                : ()
1570
                : ()
1543
            ),
1571
            ),
1544
            message_id => $message->{id}
1572
            message_id => $message->{message_id}
1545
        };
1573
        };
1546
1574
1547
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1575
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1548
- 

Return to bug 37598