From eae3bc761f559c96cfaaa2dab9750da8da56e7e6 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Mon, 12 Dec 2011 11:07:46 +0000 Subject: [PATCH] // Copy from trunk: #PSCFI-4401 - linebreaks in product return message cause fatal error in BO --- classes/order/OrderReturn.php | 3 ++- controllers/admin/AdminReturnController.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 2a5afce44..8ede7ecf9 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -65,7 +65,8 @@ class OrderReturnCore extends ObjectModel $fields['state'] = pSQL($this->state); $fields['date_add'] = pSQL($this->date_add); $fields['date_upd'] = pSQL($this->date_upd); - $fields['question'] = pSQL(Tools::nl2br($this->question), true); + // we don't want to use nl2br now because
will not pass Validation::isMessage() + $fields['question'] = pSQL($this->question, true); return $fields; } diff --git a/controllers/admin/AdminReturnController.php b/controllers/admin/AdminReturnController.php index 4361275f1..f50260996 100644 --- a/controllers/admin/AdminReturnController.php +++ b/controllers/admin/AdminReturnController.php @@ -134,9 +134,11 @@ class AdminReturnControllerCore extends AdminController } } - /* Classic products */ + // Classic products $products = OrderReturn::getOrdersReturnProducts($this->object->id, $order); + // Prepare customer explanation for display + $this->object->question = nl2br($this->object->question); $this->tpl_form_vars = array( 'customer' => new Customer($this->object->id_customer),