CRM-19784: Deprecated $config->geocoderMethod.

diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php
index 33155cea4fb1e33733c2fa2afa1b4fa0015ff467..ee4531f7450c1cd866cfd3390a92c206f89dd9b1 100644 (file)
--- a/CRM/Core/Config/MagicMerge.php
+++ b/CRM/Core/Config/MagicMerge.php
@@ -206,6 +206,7 @@ class CRM_Core_Config_MagicMerge {
       'userFrameworkResourceURL' => array('setting-url'),
 
       // "callback" properties are generated on-demand by calling a function.
+      // @todo remove geocodeMethod. As of Feb 2018, $config->geocodeMethod works but gives a deprecation warning.
       'geocodeMethod' => array('callback', 'CRM_Utils_Geocode', 'getProviderClass'),
       'defaultCurrencySymbol' => array('callback', 'CRM_Core_BAO_Country', 'getDefaultCurrencySymbol'),
     );

diff --git a/CRM/Utils/Geocode.php b/CRM/Utils/Geocode.php
index 2badc24ccdec29f76bc35a6b3631b2162872d4ab..1d3b24a23491556239c724e0639bcc7975a319b5 100644 (file)
--- a/CRM/Utils/Geocode.php
+++ b/CRM/Utils/Geocode.php
@@ -52,16 +52,7 @@ class CRM_Utils_Geocode {
       ['civi.tag' => 'deprecated']
     );
 
-    $settings = Civi::settings();
-    if ($settings->get('geoProvider')) {
-      return 'CRM_Utils_Geocode_' . $settings->get('geoProvider');
-    }
-    elseif ($settings->get('mapProvider')) {
-      return 'CRM_Utils_Geocode_' . $settings->get('mapProvider');
-    }
-    else {
-      return '';
-    }
+    return (string) CRM_Utils_GeocodeProvider::getUsableClassName();
   }
 
 }