From 56980cb3961c678a40ec85b9c3d4bea396d8d15f Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 26 Dec 2012 10:25:53 +0100
Subject: [PATCH] [-] FO : fixed CR/LF on supplier/manufacturer description
 #PSCFV-6001

---
 controllers/front/ManufacturerController.php | 1 +
 controllers/front/SupplierController.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php
index 2511c9fc5..83c85cfe3 100644
--- a/controllers/front/ManufacturerController.php
+++ b/controllers/front/ManufacturerController.php
@@ -92,6 +92,7 @@ class ManufacturerControllerCore extends FrontController
 	 */
 	protected function assignOne()
 	{
+		$this->manufacturer->description = Tools::nl2br(trim($this->manufacturer->description));
 		$nbProducts = $this->manufacturer->getProducts($this->manufacturer->id, null, null, null, $this->orderBy, $this->orderWay, true);
 		$this->pagination((int)$nbProducts);
 		$this->context->smarty->assign(array(
diff --git a/controllers/front/SupplierController.php b/controllers/front/SupplierController.php
index af980192b..e9cb4bf65 100644
--- a/controllers/front/SupplierController.php
+++ b/controllers/front/SupplierController.php
@@ -94,6 +94,7 @@ class SupplierControllerCore extends FrontController
 	 */
 	protected function assignOne()
 	{
+		$this->supplier->description = Tools::nl2br(trim($this->supplier->description));
 		$nbProducts = $this->supplier->getProducts($this->supplier->id, null, null, null, $this->orderBy, $this->orderWay, true);
 		$this->pagination((int)$nbProducts);
 		$this->context->smarty->assign(array(