From 40a2d2a7cab8540edc944648eacd2dedb6ef78f3 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 2 Feb 2012 17:01:30 +0000
Subject: [PATCH] //small bug #PSTEST-632

---
 admin-dev/themes/default/template/helper/form/form.tpl | 2 +-
 classes/controller/AdminController.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/helper/form/form.tpl b/admin-dev/themes/default/template/helper/form/form.tpl
index b67eff8ef..fa30e68f9 100644
--- a/admin-dev/themes/default/template/helper/form/form.tpl
+++ b/admin-dev/themes/default/template/helper/form/form.tpl
@@ -31,7 +31,7 @@
 				<div class="pageTitle">
 				<h3>
 					{block name=pageTitle}
-						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'|escape:'htmlall'}</span>
+						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
 					{/block}
 				</h3>
 				</div>
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 93b669fa8..71a63fc0c 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -338,7 +338,7 @@ class AdminControllerCore extends Controller
 		}
 		// note : this should use a tpl file
 		foreach ($tabs as $key => $item)
-			$bread .= '<span class="breadcrumb item-'.$key.' ">'.$item['name'].'</span> : ';
+			$bread .= '<span class="breadcrumb item-'.$key.' ">'.Tools::safeOutput($item['name']).'</span> : ';
 
 		$bread = rtrim($bread, ': ');