Cleanup deprecated CRM_Core_BAO_Settings calls CRM-17507

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

diff --git a/CRM/Utils/Address.php b/CRM/Utils/Address.php
index b9c6230a5467b83f7ed1dd8360b607ee24b21977..62c7a31b4922026f59861a5a5548745d441a8dcd 100644 (file)
--- a/CRM/Utils/Address.php
+++ b/CRM/Utils/Address.php
@@ -26,9 +26,10 @@
  */
 
 /**
- * Address utilties
+ * Address Utilities
  *
  * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2015
  */
 class CRM_Utils_Address {
 
@@ -66,11 +67,11 @@ class CRM_Utils_Address {
     static $config = NULL;
 
     if (!$format) {
-      $format = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'address_format');
+      $format = Civi::settings()->get('address_format');
     }
 
     if ($mailing) {
-      $format = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'mailing_format');
+      $format = Civi::settings()->get('mailing_format');
     }
 
     $formatted = $format;