dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459

Browse Source
This commit is contained in:
Damien Metzger
2012-12-17 15:45:40 +01:00
parent 1e7963ec12
commit 3d1663279a
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/admin/AdminImportController.php
View File

@@ -638,20 +638,20 @@ class AdminImportControllerCore extends AdminController
if (empty($field))
return array();
if (is_null(Tools::getValue('multiple_value_separator')) || trim(Tools::getValue('multiple_value_separator')) == '')
$separator = Tools::getValue('multiple_value_separator');
if (is_null($separator) || trim($separator) == '')
$separator = ',';
else
$separator = Tools::getValue('multiple_value_separator');
$temp = tmpfile();
fwrite($temp, $field);
rewind($temp);
$tab = fgetcsv($temp, MAX_LINE_SIZE, $separator);
fclose($temp);
do $uniqid = uniqid(); while (file_exists(_PS_UPLOAD_DIR_.$uniqid));
$tmp_file = file_put_contents(_PS_UPLOAD_DIR_.$uniqid, $field);
$fd = fopen($temp, 'r');
$tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);
fclose($fd);
unlink($tmp_file);
if (empty($tab) || (!is_array($tab)))
return array();
return $tab;
}
protected static function createMultiLangField($field)