Merge pull request #12264 from civicrm/5.2

[civicrm-core.git] / CRM / Utils / Geocode.php

diff --git a/CRM/Utils/Geocode.php b/CRM/Utils/Geocode.php
index 76cd832951ae3e69e18605bd40c85fbe53db2aec..36d3a46bfa7fbd8d00cff2237a136bba8a35c149 100644 (file)
--- a/CRM/Utils/Geocode.php
+++ b/CRM/Utils/Geocode.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  */
 
 /**
@@ -37,20 +37,22 @@
 class CRM_Utils_Geocode {
 
   /**
+   * @deprecated
+   *
+   * @todo Remove this method. In case people are calling this downstream (which
+   *   is unsupported usage), we'll deprecate it for a few releases before
+   *   removing it altogether.
+   *
    * @return string|''
    *   Class name, or empty.
    */
   public static function getProviderClass() {
-    $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 '';
-    }
+    Civi::log()->warning(
+      'CRM_Utils_Geocode is deprecated and will be removed from core soon, use CRM_Utils_GeocodeProvider::getUsableClassName()',
+      ['civi.tag' => 'deprecated']
+    );
+
+    return (string) CRM_Utils_GeocodeProvider::getUsableClassName();
   }
 
 }