From 7bc2d958052a7e87c5c927159630b864100267f1 Mon Sep 17 00:00:00 2001 From: Jon goldberg Date: Fri, 29 Jul 2016 17:41:44 -0400 Subject: [PATCH] Fix e-notice on CRM-19111 --- CRM/Utils/Mail/Incoming.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CRM/Utils/Mail/Incoming.php b/CRM/Utils/Mail/Incoming.php index f2aaec5d3e..a3c869402e 100644 --- a/CRM/Utils/Mail/Incoming.php +++ b/CRM/Utils/Mail/Incoming.php @@ -67,7 +67,7 @@ class CRM_Utils_Mail_Incoming { return self::formatMail($part, $attachments); } - if ($part instanceof ezcMailText || !$part) { + if ($part instanceof ezcMailText) { return self::formatMailText($part, $attachments); } @@ -83,6 +83,11 @@ class CRM_Utils_Mail_Incoming { return self::formatMailMultipart($part, $attachments); } + // CRM-19111 - Handle blank emails with a subject. + if (!$part) { + return NULL; + } + CRM_Core_Error::fatal(ts("No clue about the %1", array(1 => get_class($part)))); } -- 2.25.1