From 0d1823d79b4774c97d89fd0659f74e20e4a10d62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Frank=20J=2E=20G=C3=B3mez?= Date: Fri, 2 Feb 2018 15:43:19 -0500 Subject: [PATCH] CRM-19784: Deprecated $config->geocoderMethod. --- CRM/Core/Config/MagicMerge.php | 1 + CRM/Utils/Geocode.php | 11 +---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php index 33155cea4f..ee4531f745 100644 --- 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 2badc24ccd..1d3b24a234 100644 --- 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(); } } -- 2.25.1