projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/jgoodman/Freeside
[freeside.git]
/
rt
/
lib
/
RT
/
Template.pm
diff --git
a/rt/lib/RT/Template.pm
b/rt/lib/RT/Template.pm
index
117cc3f
..
d15c1cd
100755
(executable)
--- a/
rt/lib/RT/Template.pm
+++ b/
rt/lib/RT/Template.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-256,7
+256,7
@@
sub Create {
$args{'Queue'} = $QueueObj->Id;
}
$args{'Queue'} = $QueueObj->Id;
}
- my
$result
= $self->SUPER::Create(
+ my
( $result, $msg )
= $self->SUPER::Create(
Content => $args{'Content'},
Queue => $args{'Queue'},
Description => $args{'Description'},
Content => $args{'Content'},
Queue => $args{'Queue'},
Description => $args{'Description'},
@@
-264,7
+264,11
@@
sub Create {
Type => $args{'Type'},
);
Type => $args{'Type'},
);
- return ($result);
+ if ( wantarray ) {
+ return ( $result, $msg );
+ } else {
+ return ( $result );
+ }
}
}
@@
-335,7
+339,7
@@
sub Parse {
my ($rv, $msg);
my ($rv, $msg);
- if ($self->Content =~ m{^Content-Type:\s+text/html\b}im) {
+ if (
not $self->IsEmpty and
$self->Content =~ m{^Content-Type:\s+text/html\b}im) {
local $RT::Transaction::PreferredContentType = 'text/html';
($rv, $msg) = $self->_Parse(@_);
}
local $RT::Transaction::PreferredContentType = 'text/html';
($rv, $msg) = $self->_Parse(@_);
}
@@
-390,6
+394,7
@@
sub _Parse {
# Unfold all headers
$self->{'MIMEObj'}->head->unfold;
# Unfold all headers
$self->{'MIMEObj'}->head->unfold;
+ $self->{'MIMEObj'}->head->modify(1);
return ( 1, $self->loc("Template parsed") );
return ( 1, $self->loc("Template parsed") );
@@
-457,7
+462,7
@@
sub _ParseContentPerl {
foreach my $key ( keys %{ $args{TemplateArgs} } ) {
my $val = $args{TemplateArgs}{ $key };
next unless ref $val;
foreach my $key ( keys %{ $args{TemplateArgs} } ) {
my $val = $args{TemplateArgs}{ $key };
next unless ref $val;
- next if ref
$val
=~ /^(ARRAY|HASH|SCALAR|CODE)$/;
+ next if ref
($val)
=~ /^(ARRAY|HASH|SCALAR|CODE)$/;
$args{TemplateArgs}{ $key } = \$val;
}
$args{TemplateArgs}{ $key } = \$val;
}