From cc7c40d4e9ba2109b2effe16bd5fd1cb018b8a45 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Fri, 7 Dec 2012 17:22:06 +0100 Subject: [PATCH] [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline --- controllers/admin/AdminCustomerThreadsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 3431f6944..8f183b804 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -370,7 +370,8 @@ class AdminCustomerThreadsControllerCore extends AdminController $cm = new CustomerMessage(); $cm->id_employee = (int)$this->context->employee->id; $cm->id_customer_thread = $ct->id; - $cm->message = Tools::nl2br(Tools::htmlentitiesutf8(Tools::getValue('reply_message'))); + + $cm->message = Tools::htmlentitiesutf8(Tools::getValue('reply_message')); $cm->ip_address = ip2long($_SERVER['REMOTE_ADDR']); if (isset($_FILES) && !empty($_FILES['joinFile']['name']) && $_FILES['joinFile']['error'] != 0) $this->errors[] = Tools::displayError('An error occurred with the file upload.'); @@ -571,7 +572,6 @@ class AdminCustomerThreadsControllerCore extends AdminController if (!empty($message['id_product']) && empty($message['employee_name'])) $id_order_product = Order::getIdOrderProduct((int)$message['id_customer'], (int)$message['id_product']); } - $message['date_add'] = Tools::displayDate($message['date_add'], $this->context->language->id, true); $message['user_agent'] = strip_tags($message['user_agent']); $message['message'] = preg_replace(