From cd76b61810f259bb09c496a43fae2e73dca20121 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Tue, 3 Jan 2012 10:37:05 +0000
Subject: [PATCH] // FO performance improvements

---
 controllers/front/CartController.php | 4 ++--
 modules/blockviewed/blockviewed.php  | 2 ++
 modules/blockviewed/blockviewed.tpl  | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index 8a2b1b4a4..09e462087 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -76,7 +76,6 @@ class CartControllerCore extends FrontController
 				$this->processAllowSeperatedPackage();
 			else if(Tools::getIsset('duplicate'))
 				$this->processDuplicateProduct();
-
 			// Make redirection
 			if (!$this->errors && !$this->ajax)
 			{
@@ -247,7 +246,8 @@ class CartControllerCore extends FrontController
 	public function initContent()
 	{
 		$this->setTemplate(_PS_THEME_DIR_.'errors.tpl');
-		parent::initContent();
+		if (!$this->ajax)
+			parent::initContent();
 	}
 
 	/**
diff --git a/modules/blockviewed/blockviewed.php b/modules/blockviewed/blockviewed.php
index 55088a873..b6c9c0660 100644
--- a/modules/blockviewed/blockviewed.php
+++ b/modules/blockviewed/blockviewed.php
@@ -132,6 +132,8 @@ class BlockViewed extends Module
 					$obj->description_short = $productsImagesArray[$productViewed]['description_short'];
 					$obj->link_rewrite = $productsImagesArray[$productViewed]['link_rewrite'];
 					$obj->category_rewrite = $productsImagesArray[$productViewed]['category_rewrite'];
+					// $obj is not a real product so it cannot be used as argument for getProductLink()
+					$obj->product_link = $this->context->link->getProductLink($obj->id, $obj->link_rewrite, $obj->category_rewrite);
 
 					if (!isset($obj->cover) || !$productsImagesArray[$productViewed]['id_image'])
 					{
diff --git a/modules/blockviewed/blockviewed.tpl b/modules/blockviewed/blockviewed.tpl
index c6e5d48ff..621e95ce1 100644
--- a/modules/blockviewed/blockviewed.tpl
+++ b/modules/blockviewed/blockviewed.tpl
@@ -31,10 +31,10 @@
 		<ul class="products clearfix">
 			{foreach from=$productsViewedObj item=viewedProduct name=myLoop}
 				<li class="clearfix{if $smarty.foreach.myLoop.last} last_item{elseif $smarty.foreach.myLoop.first} first_item{else} item{/if}">
-					<a href="{$link->getProductLink($viewedProduct->id, $viewedProduct->link_rewrite, $viewedProduct->category_rewrite)}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}" class="content_img"><img src="{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium')}" height="{$mediumSize.height}" width="{$mediumSize.width}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" /></a>
+					<a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}" class="content_img"><img src="{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium')}" height="{$mediumSize.height}" width="{$mediumSize.width}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" /></a>
 					<div class="text_desc">
-						<h5><a href="{$link->getProductLink($viewedProduct->id, $viewedProduct->link_rewrite, $viewedProduct->category_rewrite)}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></h5>
-						<p><a href="{$link->getProductLink($viewedProduct->id, $viewedProduct->link_rewrite, $viewedProduct->category_rewrite)}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:44}</a></p>
+						<h5><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></h5>
+						<p><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:44}</a></p>
 					</div>
 				</li>
 			{/foreach}