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

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
vAugagneur
2012-12-17 18:05:25 +01:00
parent a7ad0d9b30 c705d1eb4b
commit 06345eab9a
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FileUploader.php
+5 -6
View File
@@ -162,14 +162,13 @@ class QqUploadedFileXhr
public function upload($path) public function upload($path)
{ {
$input = fopen('php://input', 'r'); $input = fopen('php://input', 'r');
$temp = tmpfile(); $target = fopen($path, 'w');
$realSize = stream_copy_to_stream($input, $temp);
fclose($input); $realSize = stream_copy_to_stream($input, $target);
if ($realSize != $this->getSize()) if ($realSize != $this->getSize())
return false; return false;
$target = fopen($path, 'w');
fseek($temp, 0, SEEK_SET); fclose($input);
stream_copy_to_stream($temp, $target);
fclose($target); fclose($target);
return true; return true;
classes/Product.php
+2 -2
View File
@@ -3219,8 +3219,8 @@ class ProductCore extends ObjectModel
{ {
if (!array_key_exists($row['id_product'].'-'.$id_lang, self::$_frontFeaturesCache)) if (!array_key_exists($row['id_product'].'-'.$id_lang, self::$_frontFeaturesCache))
self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang] = array(); self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang] = array();
if (!isset(self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_product']])) if (!isset(self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_feature']]))
self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_product']] = $row; self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_feature']] = $row;
} }
} }
controllers/admin/AdminImportController.php
+9 -9
View File
@@ -638,20 +638,20 @@ class AdminImportControllerCore extends AdminController
if (empty($field)) if (empty($field))
return array(); 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 = ','; $separator = ',';
else
$separator = Tools::getValue('multiple_value_separator');
$temp = tmpfile(); do $uniqid = uniqid(); while (file_exists(_PS_UPLOAD_DIR_.$uniqid));
fwrite($temp, $field); $tmp_file = file_put_contents(_PS_UPLOAD_DIR_.$uniqid, $field);
rewind($temp); $fd = fopen($temp, 'r');
$tab = fgetcsv($temp, MAX_LINE_SIZE, $separator); $tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);
fclose($temp); fclose($fd);
unlink($tmp_file);
if (empty($tab) || (!is_array($tab))) if (empty($tab) || (!is_array($tab)))
return array(); return array();
return $tab; return $tab;
} }
protected static function createMultiLangField($field) protected static function createMultiLangField($field)
install-dev/upgrade/sql/1.5.3.0.sql
+3 -1
View File
@@ -20,4 +20,6 @@ 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()); INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW());
ALTER TABLE `PREFIX_order_cart_rule` CHANGE `name` `name` VARCHAR(254); ALTER TABLE `PREFIX_order_cart_rule` CHANGE `name` `name` VARCHAR(254);
ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';