From 996db45b8b939fa13a7c9a4a2a0ecfb35f8b57dd Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Thu, 30 Aug 2012 08:14:53 +0000
Subject: [PATCH] // Perf #PSCFI-6421

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17087 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/init.php                      |  2 +-
 modules/blockcart/blockcart.tpl         | 10 +++++++++-
 modules/blockuserinfo/blockuserinfo.tpl | 10 +++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/admin-dev/init.php b/admin-dev/init.php
index 13205c363..2dbefa1ac 100644
--- a/admin-dev/init.php
+++ b/admin-dev/init.php
@@ -123,7 +123,7 @@ try
 						Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
 					}
 				}
-				else if ($context->employee->hasAuthOnShop($split[1]))
+				elseif ($context->employee->hasAuthOnShop($split[1]))
 				{
 					$shop_id = $split[1];
 					Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index bb5d0ca53..15cc5421e 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -54,7 +54,15 @@ var img_dir = '{$img_dir}';
 		<span class="ajax_cart_quantity" {if $cart_qties <= 0}style="display:none;"{/if}>{$cart_qties}</span>
 		<span class="ajax_cart_product_txt_s" {if $cart_qties <= 1}style="display:none"{/if}>{l s='products' mod='blockcart'}</span>
 		<span class="ajax_cart_product_txt" {if $cart_qties > 1}style="display:none"{/if}>{l s='product' mod='blockcart'}</span>
-		<span class="ajax_cart_total" {if $cart_qties <= 0}style="display:none"{/if}>{if $priceDisplay == 1}{convertPrice price=$cart->getOrderTotal(false)}{else}{convertPrice price=$cart->getOrderTotal(true)}{/if}</span>
+		<span class="ajax_cart_total" {if $cart_qties == 0}style="display:none"{/if}>
+			{if $cart_qties > 0}
+				{if $priceDisplay == 1}
+					{convertPrice price=$cart->getOrderTotal(false)}
+				{else}
+					{convertPrice price=$cart->getOrderTotal(true)}
+				{/if}
+			{/if}
+		</span>
 		<span class="ajax_cart_no_product" {if $cart_qties != 0}style="display:none"{/if}>{l s='(empty)' mod='blockcart'}</span>
 	</div>
 	<!-- block list of products -->
diff --git a/modules/blockuserinfo/blockuserinfo.tpl b/modules/blockuserinfo/blockuserinfo.tpl
index 815eaf764..c421a699c 100644
--- a/modules/blockuserinfo/blockuserinfo.tpl
+++ b/modules/blockuserinfo/blockuserinfo.tpl
@@ -29,12 +29,12 @@
 	<ul id="header_nav">
 		{if !$PS_CATALOG_MODE}
 		<li id="shopping_cart">
-			<a href="{$link->getPageLink("$order_process", true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}
+			<a href="{$link->getPageLink($order_process, true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}
 			<span class="ajax_cart_quantity{if $cart_qties == 0} hidden{/if}">{$cart_qties}</span>
 			<span class="ajax_cart_product_txt{if $cart_qties != 1} hidden{/if}">{l s='product' mod='blockuserinfo'}</span>
 			<span class="ajax_cart_product_txt_s{if $cart_qties < 2} hidden{/if}">{l s='products' mod='blockuserinfo'}</span>
-			{if $cart_qties >= 0}
-				<span class="ajax_cart_total{if $cart_qties == 0} hidden{/if}">
+			<span class="ajax_cart_total{if $cart_qties == 0} hidden{/if}">
+				{if $cart_qties > 0}
 					{if $priceDisplay == 1}
 						{assign var='blockuser_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant}
 						{convertPrice price=$cart->getOrderTotal(false, $blockuser_cart_flag)}
@@ -42,8 +42,8 @@
 						{assign var='blockuser_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant}
 						{convertPrice price=$cart->getOrderTotal(true, $blockuser_cart_flag)}
 					{/if}
-				</span>
-			{/if}
+				{/if}
+			</span>
 			<span class="ajax_cart_no_product{if $cart_qties > 0} hidden{/if}">{l s='(empty)' mod='blockuserinfo'}</span>
 			</a>
 		</li>