diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-06-04 00:16:28 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-06-04 00:16:28 -0700 |
| commit | 7588a4ac90a9b07c08a3107cd1107d773be1c991 (patch) | |
| tree | 55b8bedb5f899e705da0ba7f608267943bf89e94 /rt/lib/RT/Template.pm | |
| parent | 98d2b25256055abb0dfcb9f586b434474fa97afd (diff) | |
RT 4.0.13
Diffstat (limited to 'rt/lib/RT/Template.pm')
| -rwxr-xr-x | rt/lib/RT/Template.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rt/lib/RT/Template.pm b/rt/lib/RT/Template.pm index e509454b1..fd4b511e9 100755 --- a/rt/lib/RT/Template.pm +++ b/rt/lib/RT/Template.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -335,7 +335,7 @@ sub Parse { 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(@_); } @@ -458,7 +458,7 @@ sub _ParseContentPerl { 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; } |