Index: branches/5.3.x/core/units/helpers/site_config_helper.php
===================================================================
diff -u -N -r15483 -r15698
--- branches/5.3.x/core/units/helpers/site_config_helper.php	(.../site_config_helper.php)	(revision 15483)
+++ branches/5.3.x/core/units/helpers/site_config_helper.php	(.../site_config_helper.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_config_helper.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: site_config_helper.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -89,13 +89,16 @@
 		{
 			extract($changes);
 
-			$section_adjustments = $this->Application->getUnitOption('core-sections', 'SectionAdjustments', Array ());
-			$title_presets = $this->Application->getUnitOption($prefix, 'TitlePresets', Array ());
-			$fields = $this->Application->getUnitOption($prefix, 'Fields', Array ());
-			$virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields', Array ());
-			$edit_tab_presets = $this->Application->getUnitOption($prefix, 'EditTabPresets', Array ());
-			$grids = $this->Application->getUnitOption($prefix, 'Grids', Array ());
+			$config = $this->Application->getUnitConfig($prefix);
+			$core_config = $this->Application->getUnitConfig('core-sections');
 
+			$section_adjustments = $core_config->getSectionAdjustments(Array ());
+			$title_presets = $config->getTitlePresets(Array ());
+			$fields = $config->getFields(Array ());
+			$virtual_fields = $config->getVirtualFields(Array ());
+			$edit_tab_presets = $config->getEditTabPresets(Array ());
+			$grids = $config->getGrids(Array ());
+
 			$field_names = array_keys($fields);
 			$virtual_field_names = array_keys($virtual_fields);
 
@@ -173,12 +176,12 @@
 			}
 
 			// save changes
-			$this->Application->setUnitOption('core-sections', 'SectionAdjustments', $section_adjustments);
-			$this->Application->setUnitOption($prefix, 'TitlePresets', $title_presets);
-			$this->Application->setUnitOption($prefix, 'Fields', $fields);
-			$this->Application->setUnitOption($prefix, 'VirtualFields', $virtual_fields);
-			$this->Application->setUnitOption($prefix, 'EditTabPresets', $edit_tab_presets);
-			$this->Application->setUnitOption($prefix, 'Grids', $grids);
+			$core_config->setSectionAdjustments($section_adjustments);
+			$config->setTitlePresets($title_presets);
+			$config->setFields($fields);
+			$config->setVirtualFields($virtual_fields);
+			$config->setEditTabPresets($edit_tab_presets);
+			$config->setGrids($grids);
 		}
 
 		/**