Bugzilla – Attachment 21353 Details for
Bug 5544
All Notices from Branch Email Address
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 5544 - All Notices from Branch Email Address - QA Followup
Bug-5544---All-Notices-from-Branch-Email-Address--.patch (text/plain), 1.32 KB, created by
Marcel de Rooy
on 2013-09-23 10:18:43 UTC
(
hide
)
Description:
Bug 5544 - All Notices from Branch Email Address - QA Followup
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2013-09-23 10:18:43 UTC
Size:
1.32 KB
patch
obsolete
>From b86ab168828b45ac4f3d864ecfc6605b73a8b0aa 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 >Content-Type: text/plain; charset=utf-8 > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5544
:
9491
|
12164
|
14888
|
18036
|
19437
|
20807
|
21352
| 21353