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:
Jerome Nadaud committed 2013-08-27 09:50:35 +02:00
2 parents 5a685537a4 2620242176
commit de200e1c5e
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/front/CartController.php
+1 -1
View File
@@ -195,7 +195,7 @@ class CartControllerCore extends FrontController
if (is_array($cart_products)) if (is_array($cart_products))
foreach ($cart_products as $cart_product) foreach ($cart_products as $cart_product)
{ {
if ((isset($this->id_product_attribute) && $cart_product['id_product_attribute'] == $this->id_product_attribute) || if ((!isset($this->id_product_attribute) || $cart_product['id_product_attribute'] == $this->id_product_attribute) &&
(isset($this->id_product) && $cart_product['id_product'] == $this->id_product)) (isset($this->id_product) && $cart_product['id_product'] == $this->id_product))
{ {
$qty_to_check = $cart_product['cart_quantity']; $qty_to_check = $cart_product['cart_quantity'];
modules/blockcms/blockcms.php
+1 -1
View File
@@ -757,7 +757,7 @@ class BlockCms extends Module
//get all cmd block to duplicate in new shop //get all cmd block to duplicate in new shop
$cms_blocks = Db::getInstance()->executeS(' $cms_blocks = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'cms_block` cb SELECT * FROM `'._DB_PREFIX_.'cms_block` cb
LEFT JOIN `'._DB_PREFIX_.'cms_block_shop` cbf JOIN `'._DB_PREFIX_.'cms_block_shop` cbf
ON (cb.`id_cms_block` = cbf.`id_cms_block` AND cbf.`id_shop` = '.(int)$params['old_id_shop'].') '); ON (cb.`id_cms_block` = cbf.`id_cms_block` AND cbf.`id_shop` = '.(int)$params['old_id_shop'].') ');
if (count($cms_blocks)) if (count($cms_blocks))