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

(-)a/C4/Letters.pm (-2 / +2 lines)
Lines 572-581 sub SendAlerts { Link Here
572
        $letter->{content} =~ s/<order>(.*?)<\/order>/$1/gxms;
572
        $letter->{content} =~ s/<order>(.*?)<\/order>/$1/gxms;
573
573
574
        # ... then send mail
574
        # ... then send mail
575
        my $library = Koha::Libraries->find( $userenv->{branch} );
575
        my %mail = (
576
        my %mail = (
576
            To => join( ',', @email),
577
            To => join( ',', @email),
577
            Cc             => join( ',', @cc),
578
            Cc             => join( ',', @cc),
578
            From           => $userenv->{emailaddress},
579
            From           => $library->branchemail || C4::Context->preference('KohaAdminEmailAddress'),
579
            Subject        => Encode::encode( "UTF-8", "" . $letter->{title} ),
580
            Subject        => Encode::encode( "UTF-8", "" . $letter->{title} ),
580
            Message => $letter->{'is_html'}
581
            Message => $letter->{'is_html'}
581
                            ? _wrap_html( Encode::encode( "UTF-8", $letter->{'content'} ),
582
                            ? _wrap_html( Encode::encode( "UTF-8", $letter->{'content'} ),
582
- 

Return to bug 17866