X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-customers.html;h=0ed5ef380ed2b20ee3884df714aae728e0fa57f0;hb=00366d997194ebfa62b8502e638cdfef4c932256;hp=b228b72024cedc782687859242030664ba9d35b0;hpb=db9355be0f00722df45b3cecf9b55c43ede4ae3f;p=freeside.git
diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index b228b7202..0ed5ef380 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -67,8 +67,8 @@ from/subject/body cgi params
% # kludge these through hidden inputs because they're not really part
% # of the template, but should be sticky during draft editing
-
-
+
+
% if ( !$msg_template->disabled ) {
<& /elements/tr-td-label.html, 'label' => 'Template:' &>
@@ -355,7 +355,11 @@ if ( !$cgi->param('preview') ) {
my $cust_msg = $msg_template->prepare(%msgopts);
$from = $cust_msg->env_from;
$html_body = $cust_msg->preview;
- if ( $cust_msg->header =~ /^subject: (.*)/mi ) {
+#hmm. this came in with the #37098 rewrite, but isn't on v3 :/
+# causing problems with mangling subject of unrelated things
+# should probably decode instead of ignore the UTF-8 thing, but
+# this at least masks the ugliness for now :/
+ if ( $cust_msg->header =~ /^subject: (.*)/mi && $1 !~ /^\=\?UTF-8/ ) {
$subject = $1;
}
}