Index: branches/5.2.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r14428 -r14560
--- branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 14428)
+++ branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 14560)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 14428 2011-07-05 16:31:44Z alex $
+* @version	$Id: unit_config_reader.php 14560 2011-09-19 21:01:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -178,21 +178,28 @@
 	{
 		$this->Application->refreshModuleInfo();
 
-		if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) {
-			$data = $this->Application->getCache('master:config_files', false);
+		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
+			$data = $this->Application->getCache('master:config_files', false, CacheSettings::$unitCacheRebuildTime);
 		}
 		else {
-			$data = $this->Application->getDBCache('config_files');
+			$data = $this->Application->getDBCache('config_files', CacheSettings::$unitCacheRebuildTime);
 		}
 
-		if ($data) {
+		if ( $data ) {
 			$this->configFiles = unserialize($data);
 
 			if ( !defined('DBG_VALIDATE_CONFIGS') && !DBG_VALIDATE_CONFIGS ) {
 				shuffle($this->configFiles);
 			}
 		}
 		else {
+			if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
+				$this->Application->rebuildCache('master:config_files', kCache::REBUILD_NOW, CacheSettings::$unitCacheRebuildTime);
+			}
+			else {
+				$this->Application->rebuildDBCache('config_files', kCache::REBUILD_NOW, CacheSettings::$unitCacheRebuildTime);
+			}
+
 			$this->findConfigFiles(FULL_PATH . DIRECTORY_SEPARATOR . 'core'); // search from core directory
 			$this->findConfigFiles($folderPath); // search from modules directory