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

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

Browse Source
This commit is contained in:
vAugagneur
2012-12-17 16:51:36 +01:00
parent f127d22ba0 6e53faa91b
commit d2fedaf40d
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/functions.php
+1 -1
View File
@@ -431,7 +431,7 @@ function runAdminTab($tab, $ajaxMode = false)
$bread = '';
foreach ($tabs AS $key => $item)
{
$bread .= ' <img src="../img/admin/separator_breadcrum.png" style="margin-right:5px" alt="&gt;" />';
$bread .= ' <img src="../img/admin/separator_breadcrumb.png" style="margin-right:5px" alt="&gt;" />';
if (count($tabs) - 1 > $key)
$bread .= '<a href="?tab='.$item['class_name'].'&token='.Tools::getAdminToken($item['class_name'].intval($item['id_tab']).(int)Context::getContext()->employee->id).'">';
classes/FileUploader.php
+5 -6
View File
@@ -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;
controllers/admin/AdminImportController.php
+9 -9
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)
install-dev/upgrade/sql/1.5.3.0.sql
+3 -1
View File
@@ -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());
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 '';