From 9de5876b2999b2e8baf7f05abdbbb18368c79696 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Thu, 7 Jun 2012 08:21:32 +0000
Subject: [PATCH] // Fixed favorite products display

---
 modules/favoriteproducts/FavoriteProduct.php                 | 5 ++---
 .../views/templates/front/favoriteproducts-account.tpl       | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/favoriteproducts/FavoriteProduct.php b/modules/favoriteproducts/FavoriteProduct.php
index eb2f14d77..4b5b80dfb 100644
--- a/modules/favoriteproducts/FavoriteProduct.php
+++ b/modules/favoriteproducts/FavoriteProduct.php
@@ -71,9 +71,8 @@ class FavoriteProduct extends ObjectModel
 			LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
 			LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
 			WHERE product_shop.`active` = 1
-				AND product_attribute_shop.`default_on` = 1
-				'.($id_customer ? ' AND fp.id_customer = '.(int)$id_customer : '').'
-				'.Shop::addSqlRestriction(false, 'fp')
+			'.($id_customer ? ' AND fp.id_customer = '.(int)$id_customer : '').'
+			'.Shop::addSqlRestriction(false, 'fp')
 		);
 	}
 
diff --git a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
index eb3e9e32b..9b18f45ed 100644
--- a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
+++ b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
@@ -69,7 +69,7 @@ $('document').ready(function()
 				<a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'htmlall':'UTF-8'}" class="product_img_link">
 					<img src="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium')|escape:'htmlall':'UTF-8'}" alt=""/></a>
 				<h3><a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'htmlall':'UTF-8'}">{$favoriteProduct.name|escape:'htmlall':'UTF-8'}</a></h3>
-				<div class="product_desc">{$favoriteProduct.description_short|escape:'htmlall':'UTF-8'}</div>
+				<div class="product_desc">{$favoriteProduct.description_short|strip_tags|escape:'htmlall':'UTF-8'}</div>
 
 				<div class="remove">
 					<img rel="ajax_id_favoriteproduct_{$favoriteProduct.id_product}" src="{$img_dir}icon/delete.gif" alt="" class="icon" />