[Rt-commit] r16185 - in rt/3.8/trunk: .

[falcone at bestpractical.com]

Author: falcone
Date: Wed Oct  1 17:30:12 2008
New Revision: 16185

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/lib/RT/Template_Overlay.pm

Log:
 r40345 at ketch:  falcone | 2008-10-01 17:28:18 -0400
 * remove unused $orig_entity 
 * We don't HTMLify things, we deHTMLify things, and if there was a template
   written in HTML that didn't have a call to Content, we wouldn't make it 
   into a multi-part message.  This is wrong.  Always deHTMLize if we have
   an html message.


Modified: rt/3.8/trunk/lib/RT/Template_Overlay.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Template_Overlay.pm	(original)
+++ rt/3.8/trunk/lib/RT/Template_Overlay.pm	Wed Oct  1 17:30:12 2008
@@ -312,13 +312,7 @@
         ($rv, $msg) = $self->_Parse(@_);
     }
 
-    # We only HTMLify things if the template includes at least one Transaction->Content call.
-    return ($rv, $msg) unless $rv and $self->Content =~ /->\s*Content\b/;
-    
-
-    my $orig_entity = $self->MIMEObj;
     my $mime_type   = $self->MIMEObj->mime_type;
-
     if (defined $mime_type and $mime_type eq 'text/html') {
         $self->_DowngradeFromHTML(@_);
     }