From: Tim Otten <totten@civicrm.org>
Date: Sun, 23 Aug 2015 15:58:01 +0000 (-0700)
Subject: CRM_Utils_Geocode - Read settings instead of config
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8cef4325bfb9ba70fac9455f05d08e5aaf3b68aa;p=civicrm-core.git

CRM_Utils_Geocode - Read settings instead of config
---

diff --git a/CRM/Utils/Geocode.php b/CRM/Utils/Geocode.php
index 789a98dd76..cf26e222ec 100644
--- a/CRM/Utils/Geocode.php
+++ b/CRM/Utils/Geocode.php
@@ -35,12 +35,12 @@ class CRM_Utils_Geocode {
    *   Class name, or empty.
    */
   public static function getProviderClass() {
-    $config = CRM_Core_Config::singleton();
-    if ($config->geoProvider) {
-      return 'CRM_Utils_Geocode_' . $config->geoProvider;
+    $settings = Civi::settings();
+    if ($settings->get('geoProvider')) {
+      return 'CRM_Utils_Geocode_' . $settings->get('geoProvider');
     }
-    elseif ($config->mapProvider) {
-      return 'CRM_Utils_Geocode_' . $config->mapProvider;
+    elseif ($settings->get('mapProvider')) {
+      return 'CRM_Utils_Geocode_' . $settings->get('mapProvider');
     }
     else {
       return '';