|
@@ -142,6 +142,7 @@ $endatlinenb = (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
|
|
|
$updatekeys = (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array());
|
|
|
$separator = (GETPOST('separator', 'alphanohtml') ? GETPOST('separator', 'alphanohtml', 3) : '');
|
|
|
$enclosure = (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"'); // We must use 'nohtml' and not 'alphanohtml' because we must accept "
|
|
|
+$charset = GETPOST('charset', 'aZ09');
|
|
|
$separator_used = str_replace('\t', "\t", $separator);
|
|
|
|
|
|
$objimport = new Import($db);
|
|
@@ -802,6 +803,7 @@ if ($step == 4 && $datatoimport) {
|
|
|
if ($model == 'csv') {
|
|
|
$obj->separator = $separator_used;
|
|
|
$obj->enclosure = $enclosure;
|
|
|
+ $obj->charset = '';
|
|
|
}
|
|
|
if ($model == 'xlsx') {
|
|
|
if (!preg_match('/\.xlsx$/i', $filetoimport)) {
|