[freeside-commits] branch FREESIDE_2_3_BRANCH updated. dbeb313147d5bbe625d060183a49d24c9f4a4787

Ivan ivan at 420.am
Mon Jul 9 22:20:02 PDT 2012


The branch, FREESIDE_2_3_BRANCH has been updated
       via  dbeb313147d5bbe625d060183a49d24c9f4a4787 (commit)
      from  dc8da661243bf26a0a3c2471651e581d2d846a74 (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 dbeb313147d5bbe625d060183a49d24c9f4a4787
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jul 9 22:19:55 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 a0affd9..ef9f4bf 100644
--- a/rt/lib/RT/EmailParser.pm
+++ b/rt/lib/RT/EmailParser.pm
@@ -584,7 +584,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} )
@@ -595,7 +595,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