From: Ivan Kohler Date: Tue, 10 Jul 2012 05:19:49 +0000 (-0700) Subject: prevent RT::EmailParser::RescueOutlook from throwing a fatal error.. still better... X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=acf95956ea282bd4145536d1dc6b4f015af42bf5 prevent RT::EmailParser::RescueOutlook from throwing a fatal error.. still better to accept the message anyway, even if it can't be rescued from Outlook --- diff --git a/rt/lib/RT/EmailParser.pm b/rt/lib/RT/EmailParser.pm index 4cf4184a4..059a0967a 100644 --- a/rt/lib/RT/EmailParser.pm +++ b/rt/lib/RT/EmailParser.pm @@ -576,7 +576,7 @@ sub RescueOutlook { my $text_part; if ( $mime->head->get('Content-Type') =~ m{multipart/mixed} ) { my $first = $mime->parts(0); - if ( $first->head->get('Content-Type') =~ m{multipart/alternative} ) + if ( $first && $first->head->get('Content-Type') =~ m{multipart/alternative} ) { my $inner_first = $first->parts(0); if ( $inner_first->head->get('Content-Type') =~ m{text/plain} ) @@ -587,7 +587,7 @@ sub RescueOutlook { } elsif ( $mime->head->get('Content-Type') =~ m{multipart/alternative} ) { my $first = $mime->parts(0); - if ( $first->head->get('Content-Type') =~ m{text/plain} ) { + if ( $first && $first->head->get('Content-Type') =~ m{text/plain} ) { $text_part = $first; } }