Index: branches/5.3.x/core/units/sections/site_config_eh.php
===================================================================
diff -u -N -r15483 -r15698
--- branches/5.3.x/core/units/sections/site_config_eh.php	(.../site_config_eh.php)	(revision 15483)
+++ branches/5.3.x/core/units/sections/site_config_eh.php	(.../site_config_eh.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_config_eh.php 15137 2012-03-04 08:06:21Z alex $
+* @version	$Id: site_config_eh.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -43,8 +43,10 @@
 			$cut_pos = strrpos($prefix_file, '_config.php');
 			$prefix_file = substr($prefix_file, 0, $cut_pos) . '_' . $event->MasterEvent->Prefix . '.php';
 
+			$master_config = $event->MasterEvent->getUnitConfig();
+
 			if (file_exists(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . $prefix_file)) {
-				if ( $this->Application->getUnitOption($event->MasterEvent->Prefix, 'SiteConfigProcessed') ) {
+				if ( $master_config->getSiteConfigProcessed() ) {
 					// don't apply same site config twice during installation
 					return ;
 				}
@@ -70,6 +72,6 @@
 
 			// apply changes
 			$this->_helper->processConfigChanges($event->MasterEvent->Prefix, $changes);
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'SiteConfigProcessed', true);
+			$master_config->setSiteConfigProcessed(true);
 		}
 	}
\ No newline at end of file