Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r5431 -r6093
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 5431)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 6093)
@@ -46,7 +46,8 @@
 		'User_LoggedInGroup',
 		'SessionTimeout',
 		'UseModRewrite',
-		'AdminDirectory',
+		'UseOutputCompression',
+		'OutputCompressionLevel',
 		);
 
 		foreach ($config_vars as $var) {
@@ -124,7 +125,7 @@
 
 	function scanModules($folderPath, $cache = true)
 	{
-		if (defined('IS_INSTALL') && IS_INSTALL) {
+		if (defined('IS_INSTALL') && IS_INSTALL && !defined('FORCE_CONFIG_CACHE')) {
 			// disable config caching during installation
 			$cache = false;
 		}
@@ -195,9 +196,19 @@
 	 */
 	function ParseConfigs()
 	{
+		$prioritized_configs = array();
 		foreach ($this->configData as $prefix => $config) {
+			if (isset($config['ConfigPriority'])) {
+				$prioritized_configs[$prefix] = $config['ConfigPriority'];
+				continue;
+			}
 			$this->parseConfig($prefix);
 		}
+		asort($prioritized_configs);
+		foreach ($prioritized_configs as $prefix => $priority)
+		{
+			$this->parseConfig($prefix);
+		}
 
 		foreach ($this->configData as $prefix => $config) {
 			$this->ProcessDependencies($prefix);
@@ -448,6 +459,11 @@
 				preg_match('/\/(.*)\//U', $filename, $rets);
 				$config['ModuleFolder'] = $rets[1];
 				$config['BasePath'] = dirname(FULL_PATH.$filename);
+				if (isset($config['AdminTemplatePath'])) {
+					// append template base folder for admin templates path of this prefix
+					$module_templates = $rets[1] == 'kernel' ? '' : $rets[1].'/';
+					$config['AdminTemplatePath'] = $module_templates.$config['AdminTemplatePath'];
+				}
 				$this->configData[$prefix] = $config;
 				$this->prefixFiles[$prefix] = $filename;
 				return $prefix;
@@ -499,13 +515,15 @@
 			if (!isset($this->configData[$rets[1]])) {
 				$this->loadConfig($rets[1]);
 			}
-			$ret = getArrayValue($this->configData, $rets[1], $name, $rets[2]);
+			$ret = isset($this->configData[$rets[1]][$name][$rets[2]]) ? $this->configData[$rets[1]][$name][$rets[2]] : false;
+//			$ret = getArrayValue($this->configData, $rets[1], $name, $rets[2]);
 		}
 		else {
 			if (!isset($this->configData[$prefix])) {
 				$this->loadConfig($prefix);
 			}
-			$ret = getArrayValue($this->configData, $prefix, $name);
+			$ret = isset($this->configData[$prefix][$name]) ? $this->configData[$prefix][$name] : false;
+//			$ret = getArrayValue($this->configData, $prefix, $name);
 		}
 		return $ret === false ? $default : $ret;
 	}
@@ -522,7 +540,7 @@
 		if (!isset($this->configData[$prefix])) {
 			$this->loadConfig($prefix);
 		}
-			
+
 		return $this->configData[$prefix];
 	}