TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

force_return is a global loop parameter and default value is false

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-13 16:32:24 +02:00
parent 50a5fd166b
commit 86e727c2fb
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Core/HttpFoundation/Session/Session.php
View File

@@ -164,10 +164,12 @@ class Session extends BaseSession
$cart = null; $cart = null;
if ($cart_id) { if ($cart_id) {
$cart = CartQuery::create()->findPk($cart_id); $cart = CartQuery::create()->findPk($cart_id);
try { if($cart) {
$this->verifyValidCart($cart); try {
} catch (InvalidCartException $e) { $this->verifyValidCart($cart);
$cart = null; } catch (InvalidCartException $e) {
$cart = null;
}
} }
} }

2
core/lib/Thelia/Core/Template/Element/BaseI18nLoop.php
View File

@@ -73,7 +73,7 @@ abstract class BaseI18nLoop extends BaseLoop
$columns, $columns,
$foreignTable, $foreignTable,
$foreignKey, $foreignKey,
$forceReturn $this->getForce_return()
); );
} }
} }

1
core/lib/Thelia/Core/Template/Element/BaseLoop.php
View File

@@ -89,6 +89,7 @@ abstract class BaseLoop
Argument::createIntTypeArgument('page'), Argument::createIntTypeArgument('page'),
Argument::createIntTypeArgument('limit', PHP_INT_MAX), Argument::createIntTypeArgument('limit', PHP_INT_MAX),
Argument::createBooleanTypeArgument('backend_context', false), Argument::createBooleanTypeArgument('backend_context', false),
Argument::createBooleanTypeArgument('force_return', false),
); );
} }

4
templates/default/index.html
View File

@@ -40,7 +40,7 @@
<a href="{$URL}" itemprop="url" tabindex="-1" class="product-image"> <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
{ifloop rel="image_product_new" } {ifloop rel="image_product_new" }
<img itemprop="image" <img itemprop="image"
{loop name="image_product_new" type="image" limit="1" product="{$ID}"} {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="1" width="280" height="196" resize_mode="crop"}
src="{$IMAGE_URL}" src="{$IMAGE_URL}"
{/loop} {/loop}
alt="Product #{$LOOP_COUNT}" > alt="Product #{$LOOP_COUNT}" >
@@ -99,7 +99,7 @@
<a href="{$URL}" itemprop="url" tabindex="-1" class="product-image"> <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
{ifloop rel="image_product_promo" } {ifloop rel="image_product_promo" }
<img itemprop="image" <img itemprop="image"
{loop name="image_product_promo" type="image" limit="1" product="{$ID}"} {loop name="image_product_promo" type="image" limit="1" product="{$ID}" force_return="1" width="218" height="146" resize_mode="crop"}
src="{$IMAGE_URL}" src="{$IMAGE_URL}"
{/loop} {/loop}
alt="Product #{$LOOP_COUNT}" > alt="Product #{$LOOP_COUNT}" >