From db4b69d10c20e6fe6bbdfe5f08556cb57eeb2415 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 12 Sep 2013 18:03:30 +0200 Subject: [PATCH] [-] BO : Customer message twice encoded --- controllers/admin/AdminCustomerThreadsController.php | 2 +- controllers/front/ContactController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 3714a0a17..4e7c97c25 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -380,7 +380,7 @@ class AdminCustomerThreadsControllerCore extends AdminController $cm->id_employee = (int)$this->context->employee->id; $cm->id_customer_thread = $ct->id; - $cm->message = Tools::htmlentitiesutf8(Tools::getValue('reply_message')); + $cm->message = 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 during the file upload process.'); diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index 01941bf4d..8d3e5689e 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -144,7 +144,7 @@ class ContactControllerCore extends FrontController { $cm = new CustomerMessage(); $cm->id_customer_thread = $ct->id; - $cm->message = Tools::htmlentitiesUTF8($message); + $cm->message = $message; if (isset($fileAttachment['rename']) && !empty($fileAttachment['rename']) && rename($fileAttachment['tmp_name'], _PS_MODULE_DIR_.'../upload/'.basename($fileAttachment['rename']))) $cm->file_name = $fileAttachment['rename']; $cm->ip_address = ip2long($_SERVER['REMOTE_ADDR']);