Index: branches/5.2.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r15130 -r15226
--- branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 15130)
+++ branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 15226)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 15130 2012-03-03 18:38:32Z alex $
+* @version	$Id: unit_config_reader.php 15226 2012-03-24 20:41:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -183,10 +183,10 @@
 		$this->Application->refreshModuleInfo();
 
 		if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
-			$data = $this->Application->getCache('master:config_files', false, CacheSettings::$unitCacheRebuildTime);
+			$data = $this->Application->getCache('master:config_files', false, $cache ? CacheSettings::$unitCacheRebuildTime : 0);
 		}
 		else {
-			$data = $this->Application->getDBCache('config_files', CacheSettings::$unitCacheRebuildTime);
+			$data = $this->Application->getDBCache('config_files', $cache ? CacheSettings::$unitCacheRebuildTime : 0);
 		}
 
 		if ( $data ) {
@@ -197,15 +197,6 @@
 			}
 		}
 		else {
-			if ( $cache ) {
-				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