From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 9 Sep 2021 22:23:05 +0000 (+1200)
Subject: Remove error handling for core error being returned
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=25db5eebd476ae4e9708cdfc9c9c201999dee7bc;p=civicrm-core.git

Remove error handling for core error being returned

This would be throwing an exception - also it isn't an error situation
---

diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
index 3ebc0a09f9..bdbd0ab9f8 100644
--- a/Civi/Token/TokenCompatSubscriber.php
+++ b/Civi/Token/TokenCompatSubscriber.php
@@ -94,11 +94,6 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
         $contact['email_greeting'] = $contact['email_greeting_display'] ?? '';
         $contact['postal_greeting'] = $contact['postal_greeting_display'] ?? '';
         $contact['addressee'] = $contact['address_display'] ?? '';
-        if (!$contact || is_a($contact, 'CRM_Core_Error')) {
-          // FIXME: Need to differentiate errors which kill the batch vs the individual row.
-          \Civi::log()->debug('Failed to generate token data. Invalid contact ID: ' . $row->context['contactId']);
-          continue;
-        }
 
         //update value of custom field token
         if (!empty($messageTokens['contact'])) {