From d7c217ae866ed4977ad1c89229ff925647695943 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Sep 2015 19:01:03 -0700
Subject: [PATCH] Remove CRM_Core_Config_Defaults

---
 CRM/Core/BAO/Country.php       |  5 ++++
 CRM/Core/Config/Defaults.php   | 50 ----------------------------------
 CRM/Core/Config/MagicMerge.php |  2 +-
 3 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 CRM/Core/Config/Defaults.php

diff --git a/CRM/Core/BAO/Country.php b/CRM/Core/BAO/Country.php
index 56fc6cd7aa..b375dd190c 100644
--- a/CRM/Core/BAO/Country.php
+++ b/CRM/Core/BAO/Country.php
@@ -150,4 +150,9 @@ class CRM_Core_BAO_Country extends CRM_Core_DAO_Country {
     return $cachedSymbol;
   }
 
+  public static function getDefaultCurrencySymbol($k = NULL) {
+    $config = CRM_Core_Config::singleton();
+    return $config->defaultCurrencySymbol(Civi::settings()->get('defaultCurrency'));
+  }
+
 }
diff --git a/CRM/Core/Config/Defaults.php b/CRM/Core/Config/Defaults.php
deleted file mode 100644
index af90e57943..0000000000
--- a/CRM/Core/Config/Defaults.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
- */
-
-/**
- * This class is a temporary place to store default setting values
- * before they will be distributed in proper places (component configurations
- * and core configuration). The name is intentionally stupid so that it will be fixed
- * ASAP.
- *
- */
-class CRM_Core_Config_Defaults {
-
-  public static function getDefaultCurrencySymbol($k = NULL) {
-    $config = CRM_Core_Config::singleton();
-    return $config->defaultCurrencySymbol(Civi::settings()->get('defaultCurrency'));
-  }
-
-}
diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php
index 48dc7a514c..d509a4f401 100644
--- a/CRM/Core/Config/MagicMerge.php
+++ b/CRM/Core/Config/MagicMerge.php
@@ -168,7 +168,7 @@ class CRM_Core_Config_MagicMerge {
       'userFrameworkResourceURL' => array('setting-url-abs', NULL, '[civicrm]/.'),
 
       'geocodeMethod' => array('callback', 'CRM_Utils_Geocode', 'getProviderClass'),
-      'defaultCurrencySymbol' => array('callback', 'CRM_Core_Config_Defaults', 'getDefaultCurrencySymbol'),
+      'defaultCurrencySymbol' => array('callback', 'CRM_Core_BAO_Country', 'getDefaultCurrencySymbol'),
     );
   }
 
-- 
2.25.1