Merge pull request #20443 from seamuslee001/fix_error_php8

[php8-compat] Fix calling method_exist with paremeter that is bool not an object in…
civicrm · May 29, 2021 · a76a8c5 · a76a8c5
2 parents f47a5f7 + bab0b1f
commit a76a8c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Utils/GeocodeProvider.php b/CRM/Utils/GeocodeProvider.php
@@ -68,7 +68,7 @@ public static function getUsableClassName() {
       // or extend a base class. While we identify and implement a geocoding
       // abstraction library (rather than continue to roll our own), we settle for
       // this check.
-      if (!method_exists($provider, 'format') && $provider !== FALSE) {
+      if ($provider !== FALSE && !method_exists($provider, 'format')) {
         Civi::log()->error('Configured geocoder is invalid, must provide a format method', ['geocode_class' => $provider]);
         $provider = FALSE;
       }