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

(-)a/C4/Letters.pm (-9 / +6 lines)
Lines 430-439 sub SendAlerts { Link Here
430
                    replyto => $branchdetails->{'branchreplyto'},
430
                    replyto => $branchdetails->{'branchreplyto'},
431
                    sender  => $branchdetails->{'branchreturnpath'},
431
                    sender  => $branchdetails->{'branchreturnpath'},
432
                    subject => Encode::encode( "utf8", "" . $letter->{title} ),
432
                    subject => Encode::encode( "utf8", "" . $letter->{title} ),
433
                    message =>
433
                    message => $letter->{'is_html'} ? _wrap_html( Encode::encode( "utf8", $letter->{'content'} ), Encode::encode( "utf8", "" . $letter->{'title'}  ) ) : Encode::encode( "utf8", "" . $letter->{'content'} ),
434
                      Encode::encode( "utf8", "" . $letter->{content} ),
434
                    contenttype => $letter->{'is_html'} ? 'text/html; charset="utf-8"' : 'text/plain; charset="utf-8"',
435
                    contenttype => 'text/plain; charset="utf8"',
436
437
                }
435
                }
438
            );
436
            );
439
            sendmail(%mail) or carp $Mail::Sendmail::error;
437
            sendmail(%mail) or carp $Mail::Sendmail::error;
Lines 518-525 sub SendAlerts { Link Here
518
            Cc             => join( ',', @cc),
516
            Cc             => join( ',', @cc),
519
            From           => $userenv->{emailaddress},
517
            From           => $userenv->{emailaddress},
520
            Subject        => Encode::encode( "utf8", "" . $letter->{title} ),
518
            Subject        => Encode::encode( "utf8", "" . $letter->{title} ),
521
            Message        => Encode::encode( "utf8", "" . $letter->{content} ),
519
            Message => $letter->{'is_html'} ? _wrap_html( Encode::encode( "utf8", $letter->{'content'} ), Encode::encode( "utf8", "" . $letter->{'title'}  ) ) : Encode::encode( "utf8", "" . $letter->{'content'} ),
522
            'Content-Type' => 'text/plain; charset="utf8"',
520
            'Content-Type' => $letter->{'is_html'} ? 'text/html; charset="utf-8"' : 'text/plain; charset="utf-8"',
523
        );
521
        );
524
522
525
        $mail{'Reply-to'} = C4::Context->preference('ReplytoDefault')
523
        $mail{'Reply-to'} = C4::Context->preference('ReplytoDefault')
Lines 567-574 sub SendAlerts { Link Here
567
                replyto => $branchdetails->{'branchreplyto'},
565
                replyto => $branchdetails->{'branchreplyto'},
568
                sender  => $branchdetails->{'branchreturnpath'},
566
                sender  => $branchdetails->{'branchreturnpath'},
569
                subject => Encode::encode( "utf8", "" . $letter->{'title'} ),
567
                subject => Encode::encode( "utf8", "" . $letter->{'title'} ),
570
                message => Encode::encode( "utf8", "" . $letter->{'content'} ),
568
                message => $letter->{'is_html'} ? _wrap_html( Encode::encode( "utf8", $letter->{'content'} ), Encode::encode( "utf8", "" . $letter->{'title'}  ) ) : Encode::encode( "utf8", "" . $letter->{'content'} ),
571
                contenttype => 'text/plain; charset="utf8"'
569
                contenttype => $letter->{'is_html'} ? 'text/html; charset="utf-8"' : 'text/plain; charset="utf-8"',
572
            }
570
            }
573
        );
571
        );
574
        sendmail(%mail) or carp $Mail::Sendmail::error;
572
        sendmail(%mail) or carp $Mail::Sendmail::error;
575
- 

Return to bug 12739