Index: branches/5.2.x/core/units/helpers/csv_helper.php =================================================================== diff -u -N -r15173 -r15445 --- branches/5.2.x/core/units/helpers/csv_helper.php (.../csv_helper.php) (revision 15173) +++ branches/5.2.x/core/units/helpers/csv_helper.php (.../csv_helper.php) (revision 15445) @@ -1,6 +1,6 @@ enclosure_mapping[(int)$this->Application->ConfigValue('CSVExportEnclosure')]; $export_data['record_separator'] = $this->separator_mapping[(int)$this->Application->ConfigValue('CSVExportSeparator')]; $export_data['page'] = 1; - - $lang_object = $this->Application->recallObject('lang.current'); - /* @var $lang_object LanguagesItem */ - - $export_data['source_encoding'] = strtoupper($lang_object->GetDBField('Charset')); + $export_data['source_encoding'] = strtoupper(CHARSET); $export_data['encoding'] = $this->Application->ConfigValue('CSVExportEncoding') ? false : 'UTF-16LE'; $this->Application->StoreVar('export_rand', $get_rand); @@ -185,10 +181,7 @@ if(!file_exists($filename) || !is_file($filename)) return 'cant_open_file'; $import_data = Array(); - - $lang_object = $this->Application->recallObject('lang.current'); - /* @var $lang_object LanguagesItem */ - $import_data['source_encoding'] = strtoupper( $lang_object->GetDBField('Charset') ); + $import_data['source_encoding'] = strtoupper(CHARSET); $import_data['encoding'] = $this->Application->ConfigValue('CSVExportEncoding') ? false : 'UTF-16LE'; $import_data['errors'] = '';