Index: branches/5.3.x/units/zones/zones_tag_processor.php
===================================================================
diff -u -N -r15492 -r15695
--- branches/5.3.x/units/zones/zones_tag_processor.php	(.../zones_tag_processor.php)	(revision 15492)
+++ branches/5.3.x/units/zones/zones_tag_processor.php	(.../zones_tag_processor.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: zones_tag_processor.php 15156 2012-03-04 09:27:14Z alex $
+* @version	$Id: zones_tag_processor.php 15695 2013-02-19 11:30:36Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -24,9 +24,11 @@
 		$selected_country_id = (int)$this->Application->GetVar('CountrySelector');
 
 		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
-		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
-		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
 
+		$countries_config = $this->Application->getUnitConfig('country-state');
+		$id_field = $countries_config->getIDField();
+		$table_name = $countries_config->getTableName();
+
 		switch ($params['show']) {
 			case 'current':
 				// selected countries in current zone
@@ -131,9 +133,11 @@
 		$destination_table = $this->getDestinationsTable($params);
 
 		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
-		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
-		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
 
+		$countries_config = $this->Application->getUnitConfig('country-state');
+		$id_field = $countries_config->getIDField();
+		$table_name = $countries_config->getTableName();
+
 		$country_id = $this->Application->GetVar('CountrySelector');
 
 		switch ($params['show']) {
@@ -216,7 +220,7 @@
 				$selected_zips = $this->Conn->qstrArray($selected_zips);
 
 				$sql = 'SELECT DISTINCT DestValue
-						FROM ' . $this->Application->getUnitOption('dst', 'TableName') . '
+						FROM ' . $this->Application->getUnitConfig('dst')->getTableName() . '
 						WHERE
 							COALESCE(DestValue, "") <> "" AND
 							ShippingZoneID <> ' . $object->GetID() . ' AND
@@ -260,7 +264,7 @@
 			$object = $this->getObject($params);
 			/* @var $object kDBItem */
 
-			$table_name = $this->Application->getUnitOption('dst', 'TableName');
+			$table_name = $this->Application->getUnitConfig('dst')->getTableName();
 
 			if ($object->IsTempTable()) {
 				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);