Index: branches/5.0.x/core/units/sections/site_config_eh.php
===================================================================
diff -u -N -r12734 -r13355
--- branches/5.0.x/core/units/sections/site_config_eh.php	(.../site_config_eh.php)	(revision 12734)
+++ branches/5.0.x/core/units/sections/site_config_eh.php	(.../site_config_eh.php)	(revision 13355)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_config_eh.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: site_config_eh.php 13355 2010-04-06 17:36:03Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -40,6 +40,11 @@
 			$prefix_file = substr($prefix_file, 0, $cut_pos) . '_' . $event->MasterEvent->Prefix . '.php';
 
 			if (file_exists(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . $prefix_file)) {
+				if ( $this->Application->getUnitOption($event->MasterEvent->Prefix, 'SiteConfigProcessed') ) {
+					// don't apply same site config twice during installation
+					return ;
+				}
+
 				require SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . $prefix_file;
 			}
 			else {
@@ -61,5 +66,6 @@
 
 			// apply changes
 			$this->_helper->processConfigChanges($event->MasterEvent->Prefix, $changes);
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'SiteConfigProcessed', true);
 		}
 	}
\ No newline at end of file