From 2805d8d37c76c7784136ebfc9711dd2dbe190f46 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Thu, 27 Sep 2012 14:24:19 +0000 Subject: [PATCH] // Fixed variable conflict $message in validateorder git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17589 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/PaymentModule.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 4aaa229f1..008ff682c 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -491,9 +491,9 @@ abstract class PaymentModuleCore extends Module $old_message = Message::getMessageByCartId((int)$this->context->cart->id); if ($old_message) { - $message = new Message((int)$old_message['id_message']); - $message->id_order = (int)$order->id; - $message->update(); + $update_message = new Message((int)$old_message['id_message']); + $update_message->id_order = (int)$order->id; + $update_message->update(); // Add this message in the customer thread $customer_thread = new CustomerThread(); @@ -510,7 +510,7 @@ abstract class PaymentModuleCore extends Module $customer_message = new CustomerMessage(); $customer_message->id_customer_thread = $customer_thread->id; $customer_message->id_employee = 0; - $customer_message->message = htmlentities($message->message, ENT_COMPAT, 'UTF-8'); + $customer_message->message = htmlentities($update_message->message, ENT_COMPAT, 'UTF-8'); $customer_message->private = 0; if (!$customer_message->add())