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

[-] FO: Fix: many fixes - domain for cookies with different url for ssl / add to cart button for minimal quantities with product attributes

Browse Source
This commit is contained in:
Rémi Gaillard
2012-11-20 19:05:21 +01:00
parent 91a4a4955e
commit 3e2de4986b
11 changed files with 87 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+4 -2
View File
@@ -3191,7 +3191,8 @@ class ProductCore extends ObjectModel
{
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][] = $row;
if (!isset(self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_product']]))
self::$_frontFeaturesCache[$row['id_product'].'-'.$id_lang][$row['id_product']] = $row;
}
}
@@ -3588,8 +3589,9 @@ class ProductCore extends ObjectModel
$cache_key = $row['id_product'].'-'.$row['id_product_attribute'].'-'.$id_lang.'-'.(int)$usetax;
if (isset($row['id_product_pack']))
$cache_key .= '-pack'.$row['id_product_pack'];
if (isset(self::$producPropertiesCache[$cache_key]))
return self::$producPropertiesCache[$cache_key];
return array_merge($row, self::$producPropertiesCache[$cache_key]);
// Datas
$row['category'] = Category::getLinkRewrite((int)$row['id_category_default'], (int)$id_lang);