diff options
Diffstat (limited to 'rt/lib/RT/Template_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Template_Overlay.pm | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/rt/lib/RT/Template_Overlay.pm b/rt/lib/RT/Template_Overlay.pm index bfff0f03e..877b5c422 100644 --- a/rt/lib/RT/Template_Overlay.pm +++ b/rt/lib/RT/Template_Overlay.pm @@ -1,8 +1,8 @@ -# BEGIN BPS TAGGED BLOCK {{{ +# {{{ BEGIN BPS TAGGED BLOCK # # COPYRIGHT: # -# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC # <jesse@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -42,7 +42,7 @@ # works based on those contributions, and sublicense and distribute # those contributions and any derivatives thereof. # -# END BPS TAGGED BLOCK }}} +# }}} END BPS TAGGED BLOCK # Portions Copyright 2000 Tobias Brox <tobix@cpan.org> =head1 NAME @@ -66,9 +66,6 @@ ok(require RT::Template); =cut - -package RT::Template; - use strict; no warnings qw(redefine); @@ -324,13 +321,10 @@ sub MIMEObj { # {{{ sub Parse -=head2 Parse +=item Parse This routine performs Text::Template parsing on the template and then imports the results into a MIME::Entity so we can really use it - - Takes a hash containing Argument, TicketObj, and TransactionObj. - It returns a tuple of (val, message) If val is 0, the message contains an error message @@ -409,15 +403,7 @@ sub _ParseContent { SOURCE => $content ); - my $is_broken = 0; - my $retval = $template->fill_in( PACKAGE => 'T', BROKEN => sub { - my (%args) = @_; - $RT::Logger->error("Template parsing error: $args{error}") - unless $args{error} =~ /^Died at /; # ignore intentional die() - $is_broken++; - return undef; - } ); - return undef if $is_broken; + my $retval = $template->fill_in( PACKAGE => 'T' ); # MIME::Parser has problems dealing with high-bit utf8 data. Encode::_utf8_off($retval); |