Index: branches/5.3.x/core/kernel/utility/formatters/multilang_formatter.php
===================================================================
diff -u -N -r15483 -r15698
--- branches/5.3.x/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 15483)
+++ branches/5.3.x/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: multilang_formatter.php 15466 2012-07-23 13:57:39Z alex $
+* @version	$Id: multilang_formatter.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -74,18 +74,19 @@
 			return ;
 		}
 
+		$config = $object->getUnitConfig();
 		$lang_field_name = $this->LangFieldName($field_name);
 
 		//substitute title field
-		$title_field = $this->Application->getUnitOption($object->Prefix, 'TitleField');
+		$title_field = $config->getTitleField();
 		if ($title_field == $field_name) {
-			$this->Application->setUnitOption($object->Prefix, 'TitleField', $lang_field_name);
+			$object->getUnitConfig()->setTitleField($lang_field_name);
 		}
 
 		$languages = $this->helper->getLanguages();
 		$primary_language_id = $this->Application->GetDefaultLanguageId();
-		$fields = $this->Application->getUnitOption($object->Prefix, 'Fields', Array ());
-		$virtual_fields = $this->Application->getUnitOption($object->Prefix, 'VirtualFields', Array ());
+		$fields = $config->getFields(Array ());
+		$virtual_fields = $config->getVirtualFields(Array ());
 
 		// substitute real field
 		if (array_key_exists($field_name, $fields)) {
@@ -119,7 +120,7 @@
 		}
 		elseif (array_key_exists($field_name, $virtual_fields)) {
 			// substitute virtual field
-			$calculated_fields = $this->Application->getUnitOption($object->Prefix, 'CalculatedFields', Array ());
+			$calculated_fields = $config->getSetting('CalculatedFields', Array ());
 			$calculated_field_special = array_key_exists($object->Special, $calculated_fields) ? $object->Special : (array_key_exists('', $calculated_fields) ? '' : false);
 			/* @var $calculated_fields Array */
 
@@ -169,7 +170,7 @@
 			$object->setCalculatedFields($object_calculated_fields);
 
 			// save back calculated fields
-			$this->Application->setUnitOption($object->Prefix, 'CalculatedFields', $calculated_fields);
+			$config->setSetting('CalculatedFields', $calculated_fields);
 
 			// makes original field non-required
 			$object_fields = $object->getFields(); // use kDBBase::getFields, since there are no kDBList::setRequired
@@ -182,7 +183,7 @@
 		}
 
 		// substitute grid fields
-		$grids = $this->Application->getUnitOption($object->Prefix, 'Grids', Array ());
+		$grids = $config->getGrids(Array ());
 		/* @var $grids Array */
 
 		foreach ($grids as $name => $grid) {
@@ -210,7 +211,7 @@
 				}
 			}
 		}
-		$this->Application->setUnitOption($object->Prefix, 'Grids', $grids);
+		$config->setGrids($grids);
 
 		//TODO: substitute possible language-fields sortings after changing language
 		if ( $object->isVirtualField($field_name) ) {
@@ -221,8 +222,8 @@
 		}
 
 		$field_options['options_processed'] = true;
-		$this->Application->setUnitOption($object->Prefix, 'Fields', $fields);
-		$this->Application->setUnitOption($object->Prefix, 'VirtualFields', $virtual_fields);
+		$config->setFields($fields);
+		$config->setVirtualFields($virtual_fields);
 	}
 
 	/*function UpdateSubFields($field, $value, &$options, &$object)