From a5456a71f7d418fa8bcfa35bed9a57cfeb1585d3 Mon Sep 17 00:00:00 2001
From: bLeveque <bruno.leveque@prestashop.com>
Date: Sat, 19 May 2012 22:15:58 +0000
Subject: [PATCH] [-] BO : Fixed an issue with htmlentities() [-] BO : Fixed
 the Sample file for Categories Import - #PSCFV-1960

---
 .../template/controllers/products/helpers/form/form.tpl     | 2 +-
 docs/csv_import/categories_import.csv                       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index 28b8f7aca..7c9fe51fd 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -74,7 +74,7 @@
 			{*todo href when nojs*}
 			{foreach $product_tabs key=numStep item=tab}
 				<li class="tab-row">
-					<a class="tab-page {if $tab.selected}selected{/if}" id="link-{$tab.id}" href="{$tab.href}&amp;updateproduct">{$tab.name|escape:'htmlall':'UTF-8'}</a>
+					<a class="tab-page {if $tab.selected}selected{/if}" id="link-{$tab.id}" href="{$tab.href}&amp;updateproduct">{$tab.name}</a>
 				</li>
 			{/foreach}
 			</ul>
diff --git a/docs/csv_import/categories_import.csv b/docs/csv_import/categories_import.csv
index fee756a5e..300974a3e 100644
--- a/docs/csv_import/categories_import.csv
+++ b/docs/csv_import/categories_import.csv
@@ -1,4 +1,4 @@
 id;Active (0/1);Name*;Parent Category;Root category (0/1);Description;Meta-title;Meta-keywords;Meta-description;URL rewritten;Image URL;ID ou nom de la boutique
-2;1;iPods;Home;0;Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.;;;;music-ipods;http://youlinktotheimage.com/img1000.jpg;1
-3;1;Accessories;0;Home;Wonderful accessories for your iPod;;;;accessories-ipod;http://youlinktotheimage.com/img1001.jpg;1
-4;1;Laptops;Home;0;The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.;Apple laptops;Apple laptops MacBook Air;Powerful and chic Apple laptops;laptops;http://youlinktotheimage.com/img1002.jpg;1
\ No newline at end of file
+10;1;iPods;Home;0;Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.;;;;music-ipods;http://yourlinktotheimage.com/img1000.jpg;1
+11;1;Accessories;Home;0;Wonderful accessories for your iPod;;;;accessories-ipod;http://yourlinktotheimage.com/img1001.jpg;1
+12;1;Laptops;Home;0;The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.;Apple laptops;Apple laptops MacBook Air;Powerful and chic Apple laptops;laptops;http://yourlinktotheimage.com/img1002.jpg;1
\ No newline at end of file