// Copy from trunk: #PSCFI-4401 - linebreaks in product return message cause fatal error in BO

2011-12-12 11:07:46 +00:00
parent 557df6b933
commit eae3bc761f
2 changed files with 5 additions and 2 deletions
@@ -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),