CRM_Core_Config - Simplify. Current cache commands are pointless.

diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index ba1f0c5a8660d77a8f717d097a2294ace9a3fbb2..33eec9344ba282b92e46a08b11ede8eadcb5fd8d 100644 (file)
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -86,31 +86,24 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
         error_reporting(error_reporting() & ~E_DEPRECATED);
       }
 
-      $cache = CRM_Utils_Cache::singleton();
-      self::$_singleton = $cache->get('CRM_Core_Config' . CRM_Core_Config::domainID());
-      if (!self::$_singleton) {
-        self::$_singleton = new CRM_Core_Config();
-        self::$_singleton->getRuntime()->initialize($loadFromDB);
-        $cache->set('CRM_Core_Config' . CRM_Core_Config::domainID(), self::$_singleton);
-      }
-      else {
-        self::$_singleton->getRuntime()->initialize(FALSE);
-      }
+      self::$_singleton = new CRM_Core_Config();
+      self::$_singleton->getRuntime()->initialize($loadFromDB);
+      if ($loadFromDB && self::$_singleton->getRuntime()->dsn) {
+        CRM_Core_DAO::init(self::$_singleton->getRuntime()->dsn);
 
-      if (self::$_singleton->getRuntime()->dsn) {
         $domain = \CRM_Core_BAO_Domain::getDomain();
         \CRM_Core_BAO_ConfigSetting::applyLocale(\Civi::settings($domain->id), $domain->locales);
-      }
 
-      unset($errorScope);
+        unset($errorScope);
 
-      CRM_Utils_Hook::config(self::$_singleton);
-      self::$_singleton->authenticate();
+        CRM_Utils_Hook::config(self::$_singleton);
+        self::$_singleton->authenticate();
 
-      // Extreme backward compat: $config binds to active domain at moment of setup.
-      self::$_singleton->getSettings();
+        // Extreme backward compat: $config binds to active domain at moment of setup.
+        self::$_singleton->getSettings();
 
-      Civi::service('settings_manager')->useDefaults();
+        Civi::service('settings_manager')->useDefaults();
+      }
     }
     return self::$_singleton;
   }

diff --git a/CRM/Core/Config/Runtime.php b/CRM/Core/Config/Runtime.php
index 7382811a1cc90d31fc03e65fd85c7d2d2e02f071..46c16ae289ff5ae018a054edc89a472cab4e280f 100644 (file)
--- a/CRM/Core/Config/Runtime.php
+++ b/CRM/Core/Config/Runtime.php
@@ -126,8 +126,6 @@ class CRM_Core_Config_Runtime {
       CRM_Utils_File::restrictAccess($this->templateCompileDir);
     }
 
-    CRM_Core_DAO::init($this->dsn);
-
     if (!defined('CIVICRM_UF')) {
       $this->fatal('You need to define CIVICRM_UF in civicrm.settings.php');
     }