Index: branches/5.2.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r15073 -r15130
--- branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 15073)
+++ branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 15130)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 15073 2012-01-18 14:25:18Z alex $
+* @version	$Id: unit_config_reader.php 15130 2012-03-03 18:38:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -238,7 +238,7 @@
 	 */
 	function ParseConfigs()
 	{
-		// 1. process normal configs and their dependencies
+		// 1. process normal configs
 		$prioritized_configs = array();
 		foreach ($this->configData as $prefix => $config) {
 			if (isset($config['ConfigPriority'])) {
@@ -249,20 +249,15 @@
 		}
 
 		foreach ($this->configData as $prefix => $config) {
-			$this->ProcessDependencies($prefix);
 			$this->postProcessConfig($prefix, 'AggregateConfigs', 'sub_prefix');
 			$clones = $this->postProcessConfig($prefix, 'Clones', 'prefix');
 		}
 
-		// 2. process prioritized configs and their dependencies
+		// 2. process prioritized configs
 		asort($prioritized_configs);
 		foreach ($prioritized_configs as $prefix => $priority) {
 			$this->parseConfig($prefix);
 		}
-
-		foreach ($prioritized_configs as $prefix => $priority) {
-			$this->ProcessDependencies($prefix);
-		}
 	}
 
 	function AfterConfigRead($store_cache = null)
@@ -287,8 +282,7 @@
 		if ($store_cache) {
 			$this->_sortRewriteListeners();
 
-			$after_event = new kEvent('adm:OnAfterCacheRebuild');
-			$this->Application->HandleEvent($after_event);
+			$this->Application->HandleEvent(new kEvent('adm:OnAfterCacheRebuild'));
 
 			$this->Application->cacheManager->UpdateUnitCache();
 
@@ -433,23 +427,8 @@
 		$register_classes = $this->getClasses($prefix);
 
 		foreach ($register_classes as $class_info) {
-			// remember class dependencies
-			$class_name = $class_info['class'];
-			$require_classes = isset($class_info['require_classes']) ? $class_info['require_classes'] : Array ();
-
-			if ($require_classes) {
-				$require_classes = (array)$require_classes;
-
-				if ( !isset($config['_Dependencies'][$class_name]) ) {
-					$config['_Dependencies'][$class_name] = Array ();
-				}
-
-				$config['_Dependencies'][$class_name] = array_merge($config['_Dependencies'][$class_name], $require_classes);
-			}
-
-			// register class
 			$this->Application->registerClass(
-				$class_name,
+				$class_info['class'],
 				$config['BasePath'] . DIRECTORY_SEPARATOR . $class_info['file'],
 				$class_info['pseudo']
 			);
@@ -706,25 +685,6 @@
 		return '<strong>'.var_export($value, true).'</strong> of '.gettype($value);
 	}
 
-	protected function ProcessDependencies($prefix)
-	{
-		$config =& $this->configData[$prefix];
-		$dependencies = getArrayValue($config, '_Dependencies');
-		/* @var $dependencies Array */
-
-		if ( !$dependencies ) {
-			return ;
-		}
-
-		foreach ($dependencies as $real_class => $requires) {
-			foreach ($requires as $class) {
-				$this->Application->registerDependency($real_class, $class);
-			}
-		}
-
-		unset($config['_Dependencies']);
-	}
-
 	function postProcessConfig($prefix, $config_key, $dst_prefix_var)
 	{
 		$main_config =& $this->configData[$prefix];