From d9bc07d03053916f1ff4a74815bc0f58480ef0fc Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 13 Sep 2013 10:45:07 +0200 Subject: [PATCH] [-] BO : quote badly decoded in customerThreads --- controllers/admin/AdminCustomerThreadsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 4e7c97c25..c53945a5b 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -597,11 +597,12 @@ class AdminCustomerThreadsControllerCore extends AdminController } $message['date_add'] = Tools::displayDate($message['date_add'], null, true); $message['user_agent'] = strip_tags($message['user_agent']); + $message['message'] = preg_replace( '/(https?:\/\/[a-z0-9#%&_=\(\)\.\? \+\-@\/]{6,1000})([\s\n<])/Uui', '\1\2', html_entity_decode($message['message'], - ENT_NOQUOTES, 'UTF-8') + ENT_QUOTES, 'UTF-8') ); $tpl->assign(array(