From 49319cbe4edca4a21e1afab94055ebf233223929 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 14 Dec 2012 17:14:01 +0100 Subject: [PATCH 1/3] // Typo in the name of an image --- admin-dev/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/functions.php b/admin-dev/functions.php index a79749b62..28e9486b8 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -431,7 +431,7 @@ function runAdminTab($tab, $ajaxMode = false) $bread = ''; foreach ($tabs AS $key => $item) { - $bread .= ' >'; + $bread .= ' >'; if (count($tabs) - 1 > $key) $bread .= ''; From 4c873cf61dda25719747f82f4e3268ba98f8cf33 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 17 Dec 2012 15:45:40 +0100 Subject: [PATCH 2/3] [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 --- classes/FileUploader.php | 11 +++++------ controllers/admin/AdminImportController.php | 18 +++++++++--------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/classes/FileUploader.php b/classes/FileUploader.php index 326eb9ef3..8958cec67 100755 --- a/classes/FileUploader.php +++ b/classes/FileUploader.php @@ -162,14 +162,13 @@ class QqUploadedFileXhr public function upload($path) { $input = fopen('php://input', 'r'); - $temp = tmpfile(); - $realSize = stream_copy_to_stream($input, $temp); - fclose($input); + $target = fopen($path, 'w'); + + $realSize = stream_copy_to_stream($input, $target); if ($realSize != $this->getSize()) return false; - $target = fopen($path, 'w'); - fseek($temp, 0, SEEK_SET); - stream_copy_to_stream($temp, $target); + + fclose($input); fclose($target); return true; diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index a6c0ddcf1..f3b3fb68d 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -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) From 6e53faa91bde2e36e1afa91214a925da34092d7b Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 17 Dec 2012 16:18:57 +0100 Subject: [PATCH 3/3] [-] FO : fixed multishipping crash when too many products and addresses --- install-dev/upgrade/sql/1.5.3.0.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql index 7633f3711..19cf3a44d 100644 --- a/install-dev/upgrade/sql/1.5.3.0.sql +++ b/install-dev/upgrade/sql/1.5.3.0.sql @@ -18,4 +18,6 @@ UPDATE `PREFIX_order_state_lang` SET `template` = 'payment' WHERE `id_order_stat DELETE FROM `PREFIX_configuration` WHERE `name`= 'PS_HIGH_HTML_THEME_COMPRESSION'; -INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW()); \ No newline at end of file +INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW()); + +ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';