From: Tim Otten <totten@civicrm.org>
Date: Fri, 29 Mar 2013 04:48:58 +0000 (-0400)
Subject: CRM_Core_Resources - Don't access settings during upgrade mode. (Fix for upgrades... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=eb89708866e285602dafed8a1b269e5071a1b058;p=civicrm-core.git

CRM_Core_Resources - Don't access settings during upgrade mode. (Fix for upgrades from 4.0.0 to 4.3.x.)
---

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 55741dcfcc..a86cfab467 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -113,7 +113,7 @@ class CRM_Core_Resources {
       self::$_singleton = new CRM_Core_Resources(
         $sys->getMapper(),
         $cache,
-        'resCacheCode'
+        CRM_Core_Config::isUpgradeMode() ? NULL : 'resCacheCode'
       );
     }
     return self::$_singleton;