Index: branches/5.1.x/units/gift_certificates/gift_certificates_config.php =================================================================== diff -u -r13100 -r13147 --- branches/5.1.x/units/gift_certificates/gift_certificates_config.php (.../gift_certificates_config.php) (revision 13100) +++ branches/5.1.x/units/gift_certificates/gift_certificates_config.php (.../gift_certificates_config.php) (revision 13147) @@ -1,6 +1,6 @@ Array('type'=>'string','required'=>1,'default'=>null, 'max_len'=>255), 'RecipientState' => Array('type'=>'string','required'=>1,'default'=>null, 'max_len'=>255), 'RecipientZipcode' => Array('type'=>'string','required'=>1,'default'=>null, 'max_len'=>255), - 'RecipientCountry' => 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' => 'USA', 'required'=>1 + 'RecipientCountry' => 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, 'required' => 1, 'default' => 'USA' ), + 'RecipientPhone' => Array('type'=>'string','default'=>null, 'max_len'=>255), 'Message' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'Code' => Array('type'=>'string','required'=>1,'default'=>null, 'max_len'=>255, 'unique'=>Array('Code')),