From acab541ddf83c10bb5ece08a95db2c473bfea565 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Mon, 18 Jun 2012 13:01:42 +0000
Subject: [PATCH] [-] MO : #PSCFV-2858 - Fix bugs with non latin chars.
 Htmlentities was not usefull

---
 modules/blocklayered/blocklayered.js  | 2 +-
 modules/blocklayered/blocklayered.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js
index 6fb3ccba3..9b9b1accd 100644
--- a/modules/blocklayered/blocklayered.js
+++ b/modules/blocklayered/blocklayered.js
@@ -398,7 +398,7 @@ function reloadContent(params_plus)
 		cache: false, // @todo see a way to use cache and to add a timestamps parameter to refresh cache each 10 minutes for example
 		success: function(result)
 		{
-			$('#layered_block_left').replaceWith(result.filtersBlock);
+			$('#layered_block_left').replaceWith(utf8_decode(result.filtersBlock));
 			
 			$('.category-product-count').html(result.categoryCount);
 			
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index 0f3ebf3c8..5c448c015 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -486,7 +486,7 @@ class BlockLayered extends Module
 		// List of product to overrride categoryController
 		$params['catProducts'] = array();
 		$selected_filters = $this->getSelectedFilters();
-		$filter_block = self::getFilterBlock($selected_filters);
+		$filter_block = $this->getFilterBlock($selected_filters);
 		$title = '';
 		if (is_array($filter_block['title_values']))
 			foreach ($filter_block['title_values'] as $key => $val)
@@ -3281,8 +3281,8 @@ class BlockLayered extends Module
 			'filters' => $filter_blocks,
 			'title_values' => $title_values,
 			'meta_values' => $meta_values,
-			'current_friendly_url' => htmlentities($param_selected),
-			'param_product_url' => htmlentities($param_product_url),
+			'current_friendly_url' => $param_selected,
+			'param_product_url' => $param_product_url,
 			'no_follow' => (!empty($param_selected) || $nofollow)
 		);
 		
@@ -3871,7 +3871,7 @@ class BlockLayered extends Module
 		
 		/* We are sending an array in jSon to the .js controller, it will update both the filters and the products zones */
 		return Tools::jsonEncode(array(
-		'filtersBlock' => $this->generateFiltersBlock($selected_filters),
+		'filtersBlock' => utf8_encode($this->generateFiltersBlock($selected_filters)),
 		'productList' => utf8_encode($product_list),
 		'pagination' => $smarty->fetch(_PS_THEME_DIR_.'pagination.tpl'),
 		'categoryCount' => $category_count));