From b86ab168828b45ac4f3d864ecfc6605b73a8b0aa Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 5 Sep 2013 12:46:06 -0400 Subject: [PATCH] Bug 5544 - All Notices from Branch Email Address - QA Followup Content-Type: text/plain; charset=utf-8 Signed-off-by: Marcel de Rooy --- C4/Letters.pm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index bb327a2..be2913f 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -945,9 +945,12 @@ sub _send_message_by_email { my $content = encode('utf8', $message->{'content'}); my $content_type = $message->{'content_type'} || 'text/plain; charset="UTF-8"'; my $is_html = $content_type =~ m/html/io; + + my $branch_email = ( $member ) ? GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} : undef; + my %sendmail_params = ( To => $to_address, - From => $message->{'from_address'} || GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress'), + From => $message->{'from_address'} || $branch_email || C4::Context->preference('KohaAdminEmailAddress'), Subject => $subject, charset => 'utf8', Message => $is_html ? _wrap_html($content, $subject) : $content, -- 1.7.7.6