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-09-23 10:42:30 +02:00
2 parents 32a7a28567 50bbf1a547
commit 7dbb6088a4
1 file changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+2 -1
View File
@@ -2468,8 +2468,9 @@ class ProductCore extends ObjectModel
if (!Validate::isBool($usetax) || !Validate::isUnsignedId($id_product)) if (!Validate::isBool($usetax) || !Validate::isUnsignedId($id_product))
die(Tools::displayError()); die(Tools::displayError());
// Initializations // Initializations
$id_group = (isset($context->customer) && $context->customer->id_default_group) ? $context->customer->id_default_group : (int)Group::getCurrent()->id; $id_group = (int)Group::getCurrent()->id;
// If there is cart in context or if the specified id_cart is different from the context cart id // If there is cart in context or if the specified id_cart is different from the context cart id
if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart && $cur_cart->id != $id_cart)) if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart && $cur_cart->id != $id_cart))