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

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/producttooltip/producttooltip.php
+2 -2
View File
@@ -165,7 +165,7 @@ class ProductToolTip extends Module
WHERE od.product_id = '.(int)($id_product).' AND o.date_add >= \''.pSQL($date).'\'
ORDER BY o.date_add DESC');
if (isset($order['date_add']))
if (isset($order['date_add']) && Validate::isDateFormat($order['date_add']) && $order['date_add'] != '0000-00-00 00:00:00')
$smarty->assign('date_last_order', $order['date_add']);
else
{
@@ -177,7 +177,7 @@ class ProductToolTip extends Module
FROM '._DB_PREFIX_.'cart_product cp
WHERE cp.id_product = '.(int)($id_product));
if (isset($cart['date_add']))
if (isset($cart['date_add']) && Validate::isDateFormat($cart['date_add']) && $cart['date_add'] != '0000-00-00 00:00:00')
$smarty->assign('date_last_cart', $cart['date_add']);
}
}