dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fixed variable conflict $message in validateorder

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17589 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-09-27 14:24:19 +00:00
parent 76a455a216
commit 2805d8d37c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/PaymentModule.php
+4 -4
View File
@@ -491,9 +491,9 @@ abstract class PaymentModuleCore extends Module
$old_message = Message::getMessageByCartId((int)$this->context->cart->id); $old_message = Message::getMessageByCartId((int)$this->context->cart->id);
if ($old_message) if ($old_message)
{ {
$message = new Message((int)$old_message['id_message']); $update_message = new Message((int)$old_message['id_message']);
$message->id_order = (int)$order->id; $update_message->id_order = (int)$order->id;
$message->update(); $update_message->update();
// Add this message in the customer thread // Add this message in the customer thread
$customer_thread = new CustomerThread(); $customer_thread = new CustomerThread();
@@ -510,7 +510,7 @@ abstract class PaymentModuleCore extends Module
$customer_message = new CustomerMessage(); $customer_message = new CustomerMessage();
$customer_message->id_customer_thread = $customer_thread->id; $customer_message->id_customer_thread = $customer_thread->id;
$customer_message->id_employee = 0; $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; $customer_message->private = 0;
if (!$customer_message->add()) if (!$customer_message->add())