CRM-19844: Fire hook_civicrm_emailProcessor('activity') only in event of Activity...

If this is triggered when the Activity API call was unsuccessful, it can lead to the mailbox processing being blocked by the rejected email.

Further emails may not be processed.

diff --git a/CRM/Utils/Mail/EmailProcessor.php b/CRM/Utils/Mail/EmailProcessor.php
index ccc16fbc8d465ad7599c81888e2c2dee5b34cffa..a995b7af8f2b1ac87bb09809e05da9e21bbf6078 100644 (file)
--- a/CRM/Utils/Mail/EmailProcessor.php
+++ b/CRM/Utils/Mail/EmailProcessor.php
@@ -259,10 +259,9 @@ class CRM_Utils_Mail_EmailProcessor {
           }
           else {
             $matches = TRUE;
+            CRM_Utils_Hook::emailProcessor('activity', $params, $mail, $result);
             echo "Processed as Activity: {$mail->subject}\n";
           }
-
-          CRM_Utils_Hook::emailProcessor('activity', $params, $mail, $result);
         }
 
         // if $matches is empty, this email is not CiviMail-bound