Index: branches/5.3.x/units/sections/section_eh.php
===================================================================
diff -u -N -r15492 -r15695
--- branches/5.3.x/units/sections/section_eh.php	(.../section_eh.php)	(revision 15492)
+++ branches/5.3.x/units/sections/section_eh.php	(.../section_eh.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: section_eh.php 15134 2012-03-03 19:04:51Z alex $
+* @version	$Id: section_eh.php 15695 2013-02-19 11:30:36Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -22,19 +22,23 @@
 		 */
 		function OnModifySiteDomainConfig($event)
 		{
-			$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
-			$edit_tab_presets['Default']['in-commerce'] = Array (
-				'title' => 'la_title_In-Commerce', 't' => 'in-commerce/site_domains/site_domain_edit', 'priority' => 2.1
-			);
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets);
+			$master_config = $event->MasterEvent->getUnitConfig();
 
-			$title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets');
-			$title_presets['site_domain_edit_in_commerce'] = Array (
-				'prefixes' => Array ('site-domain'), 'format' => "#site-domain_status# '#site-domain_titlefield#' - !la_title_In-Commerce!",
-				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
-			);
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'TitlePresets', $title_presets);
+			$master_config->addEditTabPresetTabs('Default', Array (
+				'in-commerce' => Array (
+					'title' => 'la_title_In-Commerce', 't' => 'in-commerce/site_domains/site_domain_edit', 'priority' => 2.1
+				),
+			));
 
+
+			$master_config->addTitlePresets(Array (
+				'site_domain_edit_in_commerce' => Array (
+					'prefixes' => Array ('site-domain'), 'format' => "#site-domain_status# '#site-domain_titlefield#' - !la_title_In-Commerce!",
+					'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+				),
+			));
+
+
 			$new_fields = Array (
 				'BillingCountry' => Array (
 					'type' => 'string', 'max_len' => 3,
@@ -78,20 +82,19 @@
 				),
 			);
 
-			$fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Fields');
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Fields', array_merge($fields, $new_fields));
+			$master_config->addFields($new_fields);
 
+
 			$new_columns = Array (
 				'BillingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
 				'ShippingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
 				'PrimaryCurrencyId' => Array ('title' => 'column:la_fld_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
 				'PrimaryPaymentTypeId' => Array ('title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
 			);
 
-			$grids = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Grids');
-			$grids['Default']['Fields'] = array_merge($grids['Default']['Fields'], $new_columns);
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Grids', $grids);
+			$master_config->addGridFields('Default', $new_columns);
 
+
 			if (!$this->Application->isAdmin && is_object($this->Application->siteDomain)) {
 				// re-configure object, because it's recalled before kUnitConfigReader::AfterConfigRead is called
 				$this->Application->siteDomain->Configure();