Index: branches/5.1.x/units/manufacturers/manufacturers_config.php =================================================================== diff -u -r13100 -r13147 --- branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 13100) +++ branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 13147) @@ -1,6 +1,6 @@ Array('type' => 'string','default' => null), 'Address2' => Array('type' => 'string', 'default' => null), 'City' => Array('type' => 'string','default' => null), - 'State' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array(), 'option_key_field' => 'DestAbbr', 'option_title_field' => 'Translation', 'default' => null), + 'State' => Array( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', 'options' => Array(), + 'default' => null + ), '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', '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 + ORDER BY l%2$s_Translation', + 'option_key_field' => 'DestAbbr', 'option_title_field' => 'l%2$s_Translation', 'default' => null + ), ), 'Grids' => Array (