Correction: HTML decoding for bank transfer details

abantecart · Apr 26, 2014 · 0d3b0ec · 0d3b0ec
1 parent 7d46f4e
commit 0d3b0ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...s/default_banktransfer/storefront/controller/responses/extension/default_banktransfer.php b/...s/default_banktransfer/storefront/controller/responses/extension/default_banktransfer.php
@@ -29,7 +29,7 @@ public function main() {
 		$this->view->assign('text_payment', $this->language->get('text_payment'));
 
     	$this->view->batchAssign(  $this->language->getASet() );
-		$this->view->assign('instructions', html_entity_decode($this->config->get('default_banktransfer_instructions')));
+		$this->view->assign('instructions', nl2br($this->config->get('default_banktransfer_instructions')));
 		$this->view->assign('continue', $this->html->getSecureURL('checkout/success'));		
 
 		if ($this->request->get['rt'] != 'checkout/guest_step_3') {
@@ -53,7 +53,7 @@ public function confirm() {
 		$this->load->model('checkout/order');
 
 		$comment  = $this->language->get('text_instructions') . "\n";
-		$comment .= html_entity_decode($this->config->get('default_banktransfer_instructions')) . "\n\n";
+		$comment .= $this->config->get('default_banktransfer_instructions') . "\n\n";
 		$comment .= $this->language->get('text_payment') . "\n";
 
 		$this->model_checkout_order->confirm($this->session->data['order_id'], $this->config->get('default_banktransfer_order_status_id'), $comment);

diff --git a/public_html/storefront/model/checkout/order.php b/public_html/storefront/model/checkout/order.php
@@ -360,7 +360,7 @@ public function _confirm($order_id, $order_status_id, $comment = '') {
 			$template->data['customer_email'] = $order_row['email'];
 			$template->data['customer_telephone'] = $order_row['telephone'];
 			$template->data['customer_ip'] = $order_row['ip'];
-			$template->data['comment'] = $order_row['comment'];
+			$template->data['comment'] = nl2br($order_row['comment']);
 
 			//override with the data from the before hooks 
 			if ($this->data){