Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r4766 -r4770
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 4766)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 4770)
@@ -117,21 +117,16 @@
 
 	function scanModules($folderPath)
 	{
-		if (defined('CACHE_PARSED_CONFIGS') && CACHE_PARSED_CONFIGS) {
-			$restored = $this->RestoreParsedData();
-			if ($restored) return;
-		}
+		$restored = $this->RestoreParsedData();
+		if ($restored) return;
+
 		$this->includeConfigFiles();
 		$this->ParseConfigs();
 
-		if (defined('CACHE_PARSED_CONFIGS')) {
-			$this->CacheParsedData();
-		}
+		$this->CacheParsedData();
 
-		if (defined('CACHE_CONFIGS_FILES') && $files_cached == 0) {
-			$conn =& $this->Application->GetADODBConnection();
-			$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("config_files", '.$conn->qstr(serialize($this->configFiles)).', '.adodb_mktime().')');
-		}
+		$conn =& $this->Application->GetADODBConnection();
+		$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("config_files", '.$conn->qstr(serialize($this->configFiles)).', '.adodb_mktime().')');
 
 		unset($this->configFiles);
 	}
@@ -200,16 +195,12 @@
 	function includeConfigFiles()
 	{
 		$this->Application->refreshModuleInfo();
-		if (defined('CACHE_CONFIGS_FILES')) {
-			$conn =& $this->Application->GetADODBConnection();
-			$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
-			if ($data && $data['Cached'] > 0 ) {
-				$this->configFiles = unserialize($data['Data']);
-				$files_cached = $data['Cached'];
-			}
-			else {
-				$this->findConfigFiles(''); // search from base directory
-			}
+
+		$conn =& $this->Application->GetADODBConnection();
+		$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
+		if ($data && $data['Cached'] > 0 ) {
+			$this->configFiles = unserialize($data['Data']);
+			$files_cached = $data['Cached'];
 		}
 		else {
 			$this->findConfigFiles(''); // search from base directory