Merge branch 'ticket-12455-SAVjoinFile' into develop

This commit is contained in:
Marion Muszynski 2017-04-21 13:08:04 +02:00
commit 63fc399fbf

View File

@ -192,6 +192,7 @@ class AdminCustomerThreads extends AdminTab
$fileAttachment = NULL; $fileAttachment = NULL;
if (!empty($_FILES['joinFile']['name'])) if (!empty($_FILES['joinFile']['name']))
{ {
$cm->file_name = $_FILES['joinFile']['name'];
$fileAttachment['content'] = file_get_contents($_FILES['joinFile']['tmp_name']); $fileAttachment['content'] = file_get_contents($_FILES['joinFile']['tmp_name']);
$fileAttachment['name'] = $_FILES['joinFile']['name']; $fileAttachment['name'] = $_FILES['joinFile']['name'];
$fileAttachment['mime'] = $_FILES['joinFile']['type']; $fileAttachment['mime'] = $_FILES['joinFile']['type'];
@ -219,6 +220,7 @@ class AdminCustomerThreads extends AdminTab
{ {
$ct->status = 'closed'; $ct->status = 'closed';
$ct->update(); $ct->update();
$cm->update();
} }
Tools::redirectAdmin($currentIndex.'&id_customer_thread='.(int)$id_customer_thread.'&viewcustomer_thread&token='.Tools::getValue('token')); Tools::redirectAdmin($currentIndex.'&id_customer_thread='.(int)$id_customer_thread.'&viewcustomer_thread&token='.Tools::getValue('token'));
} }