Index: branches/5.2.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r16250 -r16300
--- branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 16250)
+++ branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 16300)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 16250 2015-09-20 11:00:07Z alex $
+* @version	$Id: unit_config_reader.php 16300 2015-10-25 18:27:04Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -185,14 +185,24 @@
 
 	function includeConfigFiles($folderPath, $cache = true)
 	{
+		$data = false;
 		$this->Application->refreshModuleInfo();
 
-		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
-			$data = $this->Application->getCache('master:config_files', false, $cache ? CacheSettings::$unitCacheRebuildTime : 0);
+		if ( $cache ) {
+			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
+				$data = $this->Application->getCache(
+					'master:config_files',
+					false,
+					CacheSettings::$unitCacheRebuildTime
+				);
+			}
+			else {
+				$data = $this->Application->getDBCache(
+					'config_files',
+					CacheSettings::$unitCacheRebuildTime
+				);
+			}
 		}
-		else {
-			$data = $this->Application->getDBCache('config_files', $cache ? CacheSettings::$unitCacheRebuildTime : 0);
-		}
 
 		if ( $data ) {
 			$this->configFiles = unserialize($data);