Index: branches/5.1.x/core/units/users/users_config.php
===================================================================
diff -u -N -r13086 -r13151
--- branches/5.1.x/core/units/users/users_config.php	(.../users_config.php)	(revision 13086)
+++ branches/5.1.x/core/units/users/users_config.php	(.../users_config.php)	(revision 13151)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_config.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: users_config.php 13151 2010-01-30 17:40:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -362,23 +362,24 @@
 							        'Street' => Array('type' => 'string', 'default' => null),
 							        'Street2' => Array('type' => 'string', 'not_null' => '1', 'default' => ''),
 							        'City' => Array('type' => 'string','default' => null),
-							        'State' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter',
-							            							'options' => Array(),
-												            		'option_key_field'=>'DestAbbr','option_title_field'=>'Translation',
-												            		'not_null' => '1','default' => ''),
+							        'State' => Array(
+							        	'type' => 'string',
+							        	'formatter' => 'kOptionsFormatter', 'options' => Array(),
+										'not_null' => 1,
+										'default' => ''
+							        ),
 							        'Zip' => Array('type' => 'string','default' => null),
-							        '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
-																					AND
-																					LanguageId = %2$s
-																				ORDER BY Translation',
-												            		'option_key_field'=>'DestAbbr','option_title_field'=>'Translation',
-												           'not_null' => '1','default' => ''),
+							        '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',
+										'not_null' => 1, 'default' => ''
+							        ),
 							        'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0),
 							        'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 1),
 							        'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),