Index: branches/5.1.x/units/addresses/addresses_config.php
===================================================================
diff -u -N -r13156 -r13465
--- branches/5.1.x/units/addresses/addresses_config.php	(.../addresses_config.php)	(revision 13156)
+++ branches/5.1.x/units/addresses/addresses_config.php	(.../addresses_config.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: addresses_config.php 13156 2010-02-23 20:11:38Z alex $
+* @version	$Id: addresses_config.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -22,17 +22,6 @@
 					'AutoLoad'			=>	true,
 
 					'Hooks'				=>	Array(
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => '',
-													'HookToSpecial' => '*',
-													'HookToEvent' => Array('OnAfterItemLoad', 'OnBeforeItemCreate', 'OnBeforeItemUpdate'),
-													'DoPrefix' => '',
-													'DoSpecial' => '*',
-													'DoEvent' => 'OnPrepareStates',
-												),
-
 												// create/update profile addres (in addresses table)
 												Array(
 													'Mode' => hAFTER,
@@ -107,12 +96,11 @@
 						'Country'	=>	Array(
 							'type' => 'string',
 							'formatter' => 'kOptionsFormatter',
-            				'options_sql' => '	SELECT %1$s
-												FROM '.TABLE_PREFIX.'StdDestinations
-												LEFT JOIN '.TABLE_PREFIX.'Phrase ON '.TABLE_PREFIX.'Phrase.Phrase = '.TABLE_PREFIX.'StdDestinations.DestName
-												WHERE DestType = 1
-												ORDER BY l%2$s_Translation',
-            				'option_key_field' => 'DestAbbr', 'option_title_field' => 'l%2$s_Translation',
+            				'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+												FROM ' . TABLE_PREFIX . 'CountryStates
+												WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+												ORDER BY Name',
+            				'option_key_field' => 'IsoCode', 'option_title_field' => 'Name',
             				'not_null' => '1', 'required' => 1, 'default' => ''
 						),