Index: branches/5.3.x/core/units/helpers/multilanguage_helper.php
===================================================================
diff -u -N -r15584 -r15698
--- branches/5.3.x/core/units/helpers/multilanguage_helper.php	(.../multilanguage_helper.php)	(revision 15584)
+++ branches/5.3.x/core/units/helpers/multilanguage_helper.php	(.../multilanguage_helper.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: multilanguage_helper.php 15584 2012-10-17 10:50:12Z alex $
+* @version	$Id: multilanguage_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
@@ -99,8 +99,10 @@
 
 			if ( $ret === false ) {
 				$this->Conn->nextQueryCachable = true;
-				$sql = 'SELECT ' . $this->Application->getUnitOption('lang', 'IDField') . '
-						FROM ' . $this->Application->getUnitOption('lang', 'TableName');
+				$config = $this->Application->getUnitConfig('lang');
+
+				$sql = 'SELECT ' . $config->getIDField() . '
+						FROM ' . $config->getTableName();
 				$ret = $this->Conn->GetCol($sql);
 
 				$this->Application->setCache($cache_key, $ret);
@@ -181,7 +183,7 @@
 				$this->Application->UnitConfigReader->ReReadConfigs();
 			}
 
-			foreach ($this->Application->UnitConfigReader->configData as $prefix => $config_data) {
+			foreach ($this->Application->UnitConfigReader->getPrefixes() as $prefix) {
 				$this->createFields($prefix);
 			}
 		}
@@ -201,8 +203,9 @@
 				$this->Application->UnitConfigReader->runAfterConfigRead($prefix);
 			}
 
-			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
-			$this->curFields = $this->Application->getUnitOption($prefix, 'Fields');
+			$config = $this->Application->getUnitConfig($prefix);
+			$table_name = $config->getTableName();
+			$this->curFields = $config->getFields();
 
 			if ( !($table_name && $this->curFields) || ($table_name && !$this->Conn->TableFound($table_name, kUtil::constOn('IS_INSTALL'))) ) {
 				// invalid config found or prefix not found
@@ -274,8 +277,9 @@
 		 */
 		public function copyMissingData($prefix, $src_language, $dst_language)
 		{
-			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
-			$this->curFields = $this->Application->getUnitOption($prefix, 'Fields');
+			$config = $this->Application->getUnitConfig($prefix);
+			$table_name = $config->getTableName();
+			$this->curFields = $config->getFields();
 
 			if ( !($table_name && $this->curFields) || ($table_name && !$this->Conn->TableFound($table_name, kUtil::constOn('IS_INSTALL'))) ) {
 				// invalid config found or prefix not found
@@ -296,7 +300,7 @@
 
 		function deleteField($prefix, $custom_id)
 		{
-			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
+			$table_name = $this->Application->getUnitConfig($prefix)->getTableName();
 			$sql = 'DESCRIBE '.$table_name.' "l%_cust_'.$custom_id.'"';
 			$fields = $this->Conn->GetCol($sql);
 
@@ -352,7 +356,7 @@
 			static $single_lang = null;
 			if (!isset($single_lang)) {
 				// if single language mode, then create indexes only on primary columns
-				$table_name = $this->Application->getUnitOption('lang', 'TableName');
+				$table_name = $this->Application->getUnitConfig('lang')->getTableName();
 				$sql = 'SELECT COUNT(*)
 						FROM '.$table_name.'
 						WHERE Enabled = 1';
@@ -468,9 +472,10 @@
 		 */
 		public function replaceMLCalculatedFields(kEvent $event)
 		{
+			$config = $event->getUnitConfig();
 			$editing_language = $this->getEditingLanguage();
 
-			$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields', Array ());
+			$calculated_fields = $config->getSetting('CalculatedFields', Array ());
 			/* @var $calculated_fields Array */
 
 			foreach ($calculated_fields as $special => $fields) {
@@ -479,7 +484,7 @@
 				}
 			}
 
-			$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+			$config->setSetting('CalculatedFields', $calculated_fields);
 		}
 
 		/**