From 74aa0b573c946f88c6655e68676de983315b2b9a Mon Sep 17 00:00:00 2001 From: vChabot Date: Wed, 28 Sep 2011 13:36:41 +0000 Subject: [PATCH] // fix date error ('0000-00-00' is an invalid date) git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8843 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/front/ProductController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 886765787..8cf1f087b 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -277,7 +277,7 @@ class ProductControllerCore extends FrontController $groups[$row['id_attribute_group']]['attributes_quantity'][$row['id_attribute']] = 0; $groups[$row['id_attribute_group']]['attributes_quantity'][$row['id_attribute']] += (int)($row['quantity']); - $availableDate = Tools::displayDate(strtotime($row['available_date']), $this->context->language->id); + $availableDate = ($row['available_date'] != '0000-00-00') ? Tools::displayDate($row['available_date'], $this->context->language->id) : $row['available_date']; $combinations[$row['id_product_attribute']]['attributes_values'][$row['id_attribute_group']] = $row['attribute_name']; $combinations[$row['id_product_attribute']]['attributes'][] = (int)($row['id_attribute']);