From 7e2f2c460245bc64e74bfdf584ff065aaff5cee9 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Wed, 30 Nov 2011 08:33:37 +0000
Subject: [PATCH] // Blocklayered: BO message used "echo", replaced by a
 return. // Blocklayered: Bug when show_limit = 0

---
 modules/blocklayered/blocklayered.php | 6 +++---
 modules/blocklayered/blocklayered.tpl | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index f0eacb40f..22eb6f28f 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -1211,9 +1211,9 @@ class BlockLayered extends Module
 					
 					Db::getInstance()->AutoExecute(_DB_PREFIX_.'layered_filter', $valuesToInsert, 'INSERT');
 					
-					echo '<div class="conf">'.(version_compare(_PS_VERSION_,'1.5','>') ? '' : '<img src="../img/admin/ok2.png" alt="" />').
-					$this->l('Your filter').' "'.Tools::safeOutput(Tools::getValue('layered_tpl_name')).'" '.
-					((isset($_POST['id_layered_filter']) && $_POST['id_layered_filter']) ? $this->l('was updated successfully.') : $this->l('was added successfully.')).'</div>';
+					$html .= '<div class="conf">'.(version_compare(_PS_VERSION_,'1.5','>') ? '' : '<img src="../img/admin/ok2.png" alt="" />').
+						$this->l('Your filter').' "'.Tools::safeOutput(Tools::getValue('layered_tpl_name')).'" '.
+						((isset($_POST['id_layered_filter']) && $_POST['id_layered_filter']) ? $this->l('was updated successfully.') : $this->l('was added successfully.')).'</div>';
 				}
 			}
 		}
diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl
index de947a2a5..466e065a8 100644
--- a/modules/blocklayered/blocklayered.tpl
+++ b/modules/blocklayered/blocklayered.tpl
@@ -156,7 +156,7 @@ param_product_url = '#{$param_product_url}';
 							</script>
 						{/if}
 						</ul>
-						{if count($filter.values) > $filter.filter_show_limit && $filter.filter_type != 2}
+						{if count($filter.values) > $filter.filter_show_limit && $filter.filter_show_limit > 0 && $filter.filter_type != 2}
 							<span class="hide-action more">{l s='Show more' mod='blocklayered'}</span>
 							<span class="hide-action less">{l s='Show less' mod='blocklayered'}</span>
 						{/if}