[freeside-commits] branch master updated. acf95956ea282bd4145536d1dc6b4f015af42bf5

Ivan ivan at 420.am
Mon Jul 9 22:19:55 PDT 2012


The branch, master has been updated
       via  acf95956ea282bd4145536d1dc6b4f015af42bf5 (commit)
      from  8ca531ca72ddffcc3561813bdd2f12f07b5911ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit acf95956ea282bd4145536d1dc6b4f015af42bf5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jul 9 22:19:49 2012 -0700

    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 4cf4184..059a096 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;
             }
         }

-----------------------------------------------------------------------

Summary of changes:
 rt/lib/RT/EmailParser.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list