From 71d9524291c4968ae2a36e0f1983d50bf9a71d18 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 6 Dec 2013 16:00:15 +0100
Subject: [PATCH] fix wrong integration in product template

---
 templates/frontOffice/default/product.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/frontOffice/default/product.html b/templates/frontOffice/default/product.html
index e09c97f3e..eaea6b7b4 100755
--- a/templates/frontOffice/default/product.html
+++ b/templates/frontOffice/default/product.html
@@ -197,18 +197,20 @@
             {strip}
             {capture "additional"}
                 {ifloop rel="feature_info"}
-                    {ifloop rel="feature_value_info"}
+
                         <ul>
                             {loop name="feature_info" type="feature" product="{$ID}"}
+                                {ifloop rel="feature_value_info"}
                                 <li>
                                     <strong>{$TITLE}</strong> :
                                     {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
                                     {$TITLE}
                                     {/loop}
                                 </li>
+                                {/ifloop}
                             {/loop}
                         </ul>
-                    {/ifloop}
+
                 {/ifloop}
             {/capture}
             {/strip}
@@ -221,7 +223,7 @@
                 </ul>
                 <div class="tab-content">
                     <div class="tab-pane active in" id="description" itemprop="description" role="tabpanel" aria-labelledby="tab1">
-                        <p>{$DESCRIPTION|default:'N/A'}</p>
+                        <p>{$DESCRIPTION|default:'N/A' nofilter}</p>
                     </div>
                     {if $smarty.capture.additional ne ""}
                     <div class="tab-pane" id="additional" role="tabpanel" aria-labelledby="tab2">