Attachment 20807 Details for Bug 5544 – Bug 5544 - All Notices from Branch Email Address - QA Followup

[patch] Bug 5544 - All Notices from Branch Email Address - QA Followup

Bug-5544---All-Notices-from-Branch-Email-Address--.patch (text/plain), 1.23 KB, created by Kyle M Hall (khall) on 2013-09-05 16:46:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2013-09-05 16:46:26 UTC

Size: 1.23 KB

patch

obsolete

>From 5c7292a567009f29fdb743ab072f70e6e1b40a03 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 5 Sep 2013 12:46:06 -0400
>Subject: [PATCH] Bug 5544 - All Notices from Branch Email Address - QA Followup
>
>---
> 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.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 5544: 9491 | 12164 | 14888 | 18036 | 19437 | 20807 | 21352 | 21353