Merge branch 'master' into frontend

2013-12-16 15:45:04 +01:00
parent 681ac83334 315ed1fb09
commit d6ba2b3d65
42 changed files with 541 additions and 64 deletions
--- a/templates/frontOffice/default/product.html
+++ b/templates/frontOffice/default/product.html
@@ -42,7 +42,7 @@
                {/loop}
            {/loop}
            {loop name="brand.feature" type="feature" product="{$ID}" title="isbn"}
-                {loop name="brand.value" type="feature_value" feature="{$ID}" product=$product_id}
+                {loop name="brand.value" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
                    <meta itemprop="productID" content="isbn:{$TITLE}">
                {/loop}
            {/loop}