Index: branches/5.0.x/core/kernel/application.php
===================================================================
diff -u -r12323 -r12343
--- branches/5.0.x/core/kernel/application.php	(.../application.php)	(revision 12323)
+++ branches/5.0.x/core/kernel/application.php	(.../application.php)	(revision 12343)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 12323 2009-08-17 20:39:30Z alex $
+* @version	$Id: application.php 12343 2009-08-18 10:32:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -600,57 +600,48 @@
 	*/
 	function RegisterDefaultClasses()
 	{
-		$this->registerClass('kTempTablesHandler', KERNEL_PATH.'/utility/temp_handler.php');
-		$this->registerClass('kEventManager', KERNEL_PATH.'/event_manager.php', 'EventManager');
-		$this->registerClass('kUnitConfigReader', KERNEL_PATH.'/utility/unit_config_reader.php');
+		$this->registerClass('kTempTablesHandler', KERNEL_PATH . '/utility/temp_handler.php');
+		$this->registerClass('kEventManager', KERNEL_PATH . '/event_manager.php', 'EventManager');
+		$this->registerClass('kUnitConfigReader', KERNEL_PATH . '/utility/unit_config_reader.php');
 
-		$this->registerClass('kArray', KERNEL_PATH.'/utility/params.php');
-		$this->registerClass('Params', KERNEL_PATH.'/utility/params.php');
-		$this->registerClass('kHelper', KERNEL_PATH.'/kbase.php');
+		$this->registerClass('kArray', KERNEL_PATH . '/utility/params.php');
+		$this->registerClass('Params', KERNEL_PATH . '/utility/params.php');
+		$this->registerClass('Params', KERNEL_PATH . '/utility/params.php', 'kActions');
+		$this->registerClass('kCache', KERNEL_PATH . '/utility/cache.php', 'Cache', 'Params');
+		$this->registerClass('kHTTPQuery', KERNEL_PATH . '/utility/http_query.php', 'HTTPQuery', 'Params');
 
-		$this->registerClass('kCache', KERNEL_PATH.'/utility/cache.php', 'Cache', 'Params');
-		$this->registerClass('kHTTPQuery', KERNEL_PATH.'/utility/http_query.php', 'HTTPQuery', 'Params');
+		$this->registerClass('kHelper', KERNEL_PATH . '/kbase.php');
+		$this->registerClass('kMultipleFilter', KERNEL_PATH . '/utility/filters.php');
 
-		$this->registerClass('Session', KERNEL_PATH.'/session/session.php');
-		$this->registerClass('SessionStorage', KERNEL_PATH.'/session/session.php');
+		$this->registerClass('Session', KERNEL_PATH . '/session/session.php');
+		$this->registerClass('SessionStorage', KERNEL_PATH . '/session/session.php');
+		$this->registerClass('InpSession', KERNEL_PATH . '/session/inp_session.php', 'Session');
+		$this->registerClass('InpSessionStorage', KERNEL_PATH . '/session/inp_session.php', 'SessionStorage');
 
-		$this->registerClass('Params', KERNEL_PATH.'/utility/params.php', 'kActions');
+		$this->registerClass('kTagProcessor', KERNEL_PATH . '/processors/tag_processor.php');
+		$this->registerClass('kMainTagProcessor', KERNEL_PATH . '/processors/main_processor.php','m_TagProcessor', 'kTagProcessor');
 
-		$this->registerClass('kMultipleFilter', KERNEL_PATH.'/utility/filters.php');
-		$this->registerClass('kDBList', KERNEL_PATH.'/db/dblist.php');
-		$this->registerClass('kDBItem', KERNEL_PATH.'/db/dbitem.php');
-		$this->registerClass('kDBEventHandler', KERNEL_PATH.'/db/db_event_handler.php');
+		$this->registerClass('kDBList', KERNEL_PATH . '/db/dblist.php');
+		$this->registerClass('kDBItem', KERNEL_PATH . '/db/dbitem.php');
+		$this->registerClass('kDBEventHandler', KERNEL_PATH . '/db/db_event_handler.php');
+		$this->registerClass('kDBTagProcessor', KERNEL_PATH . '/db/db_tag_processor.php', null, 'kTagProcessor');
+		$this->registerClass('kCatDBItem', KERNEL_PATH . '/db/cat_dbitem.php');
+		$this->registerClass('kCatDBList', KERNEL_PATH . '/db/cat_dblist.php');
+		$this->registerClass('kCatDBEventHandler', KERNEL_PATH . '/db/cat_event_handler.php');
+		$this->registerClass('kCatDBTagProcessor', KERNEL_PATH . '/db/cat_tag_processor.php');
 
-		$this->registerClass('kTagProcessor', KERNEL_PATH.'/processors/tag_processor.php');
-		$this->registerClass('kMainTagProcessor', KERNEL_PATH.'/processors/main_processor.php','m_TagProcessor', 'kTagProcessor');
-		$this->registerClass('kDBTagProcessor', KERNEL_PATH.'/db/db_tag_processor.php', null, 'kTagProcessor');
+		$this->registerClass('NParser', KERNEL_PATH . '/nparser/nparser.php');
+		$this->registerClass('TemplatesCache', KERNEL_PATH . '/nparser/template_cache.php', null, Array ('kHelper', 'kDBTagProcessor'));
 
-		$this->registerClass('TemplatesCache', KERNEL_PATH.'/nparser/template_cache.php', null, Array ('kHelper', 'kDBTagProcessor'));
-		$this->registerClass('NParser', KERNEL_PATH.'/nparser/nparser.php');
+		$this->registerClass('kEmailSendingHelper', KERNEL_PATH . '/utility/email_send.php', 'EmailSender', 'kHelper');
+		$this->registerClass('kSocket', KERNEL_PATH . '/utility/socket.php', 'Socket');
 
-		$this->registerClass('kEmailSendingHelper', KERNEL_PATH.'/utility/email_send.php', 'EmailSender', 'kHelper');
-		$this->registerClass('kSocket', KERNEL_PATH.'/utility/socket.php', 'Socket');
-
-		if (file_exists(MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php')) {
-			$this->registerClass('kCurrencyRates', MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php');
+		if (file_exists(MODULES_PATH . '/in-commerce/units/currencies/currency_rates.php')) {
+			$this->registerClass('kCurrencyRates', MODULES_PATH . '/in-commerce/units/currencies/currency_rates.php');
 		}
 
-		/* Moved from MyApplication */
-
-		$this->registerClass('InpSession',KERNEL_PATH.'/../units/general/inp_ses_storage.php', 'Session');
-		$this->registerClass('InpSessionStorage',KERNEL_PATH.'/../units/general/inp_ses_storage.php', 'SessionStorage');
-
-		$this->registerClass('kCatDBItem',KERNEL_PATH.'/../units/general/cat_dbitem.php');
-		$this->registerClass('kCatDBItemExportHelper',KERNEL_PATH.'/../units/general/cat_dbitem_export.php', 'CatItemExportHelper');
-		$this->registerClass('kCatDBList',KERNEL_PATH.'/../units/general/cat_dblist.php');
-		$this->registerClass('kCatDBEventHandler',KERNEL_PATH.'/../units/general/cat_event_handler.php');
-		$this->registerClass('kCatDBTagProcessor',KERNEL_PATH.'/../units/general/cat_tag_processor.php');
-
-		// Do not move to config - this helper is used before configs are read
-		$this->registerClass('kModulesHelper', KERNEL_PATH.'/../units/helpers/modules_helper.php', 'ModulesHelper');
-
-		/* End moved */
-
+		// do not move to config - this helper is used before configs are read
+		$this->registerClass('kModulesHelper', KERNEL_PATH . '/../units/helpers/modules_helper.php', 'ModulesHelper');
 	}
 
 	function RegisterDefaultBuildEvents()