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:
Gregory Roussac
2013-01-03 15:20:08 +01:00
parent 5c80535287 cc32366077
commit 9513a9e599
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ProductSale.php
+1 -1
View File
@@ -68,7 +68,7 @@ class ProductSaleCore
$final_order_by = $order_by;
if (empty($order_by) || $order_by == 'position' || $order_by = 'price') $order_by = 'sales';
if (empty($order_way)) $order_way = 'DESC';
if (empty($order_way) || $order_by == 'sales') $order_way = 'DESC';
$groups = FrontController::getCurrentCustomerGroups();
$sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
controllers/admin/AdminCartsController.php
+1 -1
View File
@@ -570,7 +570,7 @@ class AdminCartsControllerCore extends AdminController
if (isset($summary['gift_products']) && count($summary['gift_products']))
foreach ($summary['gift_products'] as &$product)
{
$product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small');
$product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default');
if (!isset($product['attributes_small']))
$product['attributes_small'] = '';
}
controllers/admin/AdminImportController.php
+4 -4
View File
@@ -642,12 +642,12 @@ class AdminImportControllerCore extends AdminController
if (is_null($separator) || trim($separator) == '')
$separator = ',';
do $uniqid = uniqid(); while (file_exists(_PS_UPLOAD_DIR_.$uniqid));
$tmp_file = file_put_contents(_PS_UPLOAD_DIR_.$uniqid, $field);
$fd = fopen($temp, 'r');
do $uniqid_path = _PS_UPLOAD_DIR_.uniqid(); while (file_exists($uniqid_path));
file_put_contents($uniqid_path, $field);
$fd = fopen($uniqid_path, 'r');
$tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);
fclose($fd);
unlink($tmp_file);
unlink($uniqid_path);
if (empty($tab) || (!is_array($tab)))
return array();