Merge pull request #22682 from agileware/CIVICRM-1922

[civicrm-core.git] / CRM / Utils / Mail / Incoming.php

diff --git a/CRM/Utils/Mail/Incoming.php b/CRM/Utils/Mail/Incoming.php
index cf2f7978b1291fc8821d0548851df983a40a4827..c53e66fe6b0a0fb395918e610f184d058d76dfe0 100644 (file)
--- a/CRM/Utils/Mail/Incoming.php
+++ b/CRM/Utils/Mail/Incoming.php
@@ -76,7 +76,7 @@ class CRM_Utils_Mail_Incoming {
       return NULL;
     }
 
-    return self::formatMailUnrecognisedPart($part);
+    return self::formatUnrecognisedPart($part);
   }
 
   /**
@@ -110,7 +110,7 @@ class CRM_Utils_Mail_Incoming {
       return self::formatMailDeliveryStatus($part);
     }
 
-    return self::formatMailUnrecognisedPart($part);
+    return self::formatUnrecognisedPart($part);
   }
 
   /**
@@ -237,7 +237,7 @@ class CRM_Utils_Mail_Incoming {
    *
    * @return string
    */
-  public function formatUnrecognisedPart($part) {
+  public static function formatUnrecognisedPart($part) {
     CRM_Core_Error::debug_log_message(ts('CRM_Utils_Mail_Incoming: Unable to handle message part of type "%1".', [1 => get_class($part)]));
     return ts('Unrecognised message part of type "%1".', [1 => get_class($part)]);
   }
@@ -452,7 +452,8 @@ class CRM_Utils_Mail_Incoming {
     $contactID = NULL;
     if ($dao) {
       $contactID = $dao->contact_id;
-    } else {
+    }
+    else {
       $dao = CRM_Contact_BAO_Contact::matchContactOnEmail($email, 'Organization');
 
       if ($dao) {