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 2badc24ccdec29f76bc35a6b3631b2162872d4ab..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
  */
 
 /**
@@ -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();
   }
 
 }