CRM_Core_Resources - Don't access settings during upgrade mode. (Fix for upgrades...

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 55741dcfcc821db97cf90b7d1a413e04deda19d3..a86cfab4679ac3ab3cd270c012af86261217032f 100644 (file)
--- 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;