From 14aa2edcc9ee8744790e019aefedc0c686e6458f Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 20 Sep 2012 13:41:02 +0000
Subject: [PATCH] [-] FO : fixed bug #PSCFI-2571 #PSCFI-2571

---
 controllers/front/SearchController.php | 5 ++++-
 themes/default/search.tpl              | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php
index b8a79024a..b3ccbc4bf 100644
--- a/controllers/front/SearchController.php
+++ b/controllers/front/SearchController.php
@@ -121,7 +121,7 @@ class SearchControllerCore extends FrontController
 				'pages_nb' => 1,
 				'nbProducts' => 0));
 		}
-		$this->context->smarty->assign('add_prod_display', Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'));
+		$this->context->smarty->assign(array('add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'), 'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')));
 
 		$this->setTemplate(_PS_THEME_DIR_.'search.tpl');
 	}
@@ -146,5 +146,8 @@ class SearchControllerCore extends FrontController
 
 		if (!$this->instant_search && !$this->ajax_search)
 			$this->addCSS(_THEME_CSS_DIR_.'product_list.css');
+			
+		if (Configuration::get('PS_COMPARATOR_MAX_ITEM'))
+			$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
 	}
 }
diff --git a/themes/default/search.tpl b/themes/default/search.tpl
index 551b2cb72..a820be587 100644
--- a/themes/default/search.tpl
+++ b/themes/default/search.tpl
@@ -45,7 +45,7 @@
 	</p>
 {else}
 	<h3 class="nbresult"><span class="big">{if $nbProducts == 1}{l s='%d result has been found.' sprintf=$nbProducts|intval}{else}{l s='%d results have been found.' sprintf=$nbProducts|intval}{/if}</span></h3>
-	
+	{include file="./product-compare.tpl"}
 	{if !isset($instantSearch) || (isset($instantSearch) && !$instantSearch)}
 	<div class="sortPagiBar clearfix">
 		{include file="$tpl_dir./product-sort.tpl"}
@@ -54,4 +54,5 @@
 	
 	{include file="$tpl_dir./product-list.tpl" products=$search_products}
 	{if !isset($instantSearch) || (isset($instantSearch) && !$instantSearch)}{include file="$tpl_dir./pagination.tpl"}{/if}
+	{include file="./product-compare.tpl"}
 {/if}