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

// Retrocompatibility fix on product links

Browse Source
This commit is contained in:
rMalie
2012-01-17 13:03:32 +00:00
parent e95f24b281
commit d33548a26f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Link.php
+4 -4
View File
@@ -87,9 +87,9 @@ class LinkCore
if (!is_object($product))
{
if (is_array($product) && isset($product['id_product']))
$product = new Product((int)$product['id_product'], false, $id_lang);
else if(is_numeric($product))
$product = new Product((int)$product, false, $id_lang);
$product = new Product($product['id_product'], false, $id_lang);
else if (is_numeric($product) || !$product)
$product = new Product($product, false, $id_lang);
else
throw new PrestaShopException('Invalid product vars');
}
@@ -110,7 +110,7 @@ class LinkCore
$params['supplier'] = Tools::str2url($product->isFullyLoaded ? $product->supplier_name : Supplier::getNameById($product->id_supplier));
if ($dispatcher->hasKeyword('product_rule', 'price'))
$params['supplier'] = $product->isFullyLoaded ? $product->price : Product::getPriceStatic($product->id, false, NULL, 6, NULL, false, true, 1, false, NULL, NULL, NULL, $product->specificPrice);
$params['supplier'] = $product->isFullyLoaded ? $product->price : Product::getPriceStatic($product->id, false, null, 6, null, false, true, 1, false, null, null, null, $product->specificPrice);
if ($dispatcher->hasKeyword('product_rule', 'tags'))
$params['tags'] = Tools::str2url($product->getTags($id_lang));
classes/Product.php
+5
View File
@@ -207,6 +207,11 @@ class ProductCore extends ObjectModel
public $is_virtual;
public $cache_default_attribute;
/**
* @var string If product is populated, this property contain the rewrite link of the default category
*/
public $category;
public static $_taxCalculationMethod = PS_TAX_EXC;
protected static $_prices = array();
protected static $_pricesLevel2 = array();