fixes core#2929: Don't crash a contribution because of a geocoding failure

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index 0d0fe6b21d33a5d4d5196d5b35ec68ead4b07fad..29dcdc31a1eed0c52a04df1f7198cd041444c76d 100644 (file)
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -1283,8 +1283,13 @@ SELECT is_primary,
     catch (CRM_Core_Exception $e) {
       $providerExists = FALSE;
     }
-    if ($providerExists) {
-      $provider::format($params);
+    try {
+      if ($providerExists) {
+        $provider::format($params);
+      }
+    }
+    catch (CRM_Core_Exception $e) {
+      \Civi::log()->error('Geocoding error:' . $e->getMessage());
     }
     // dev/core#2379 - Limit geocode length to 14 characters to avoid validation error on save in UI.
     foreach (['geo_code_1', 'geo_code_2'] as $geocode) {