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

// Add config/alias.php file + refactoring of DB / MySQL classes

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7668 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-20 16:10:12 +00:00
parent 42da42f827
commit e921117581
19 changed files with 494 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminCustomerThreads.php
+2 -2
View File
@@ -156,7 +156,7 @@ class AdminCustomerThreads extends AdminTab
$cm = new CustomerMessage();
$cm->id_employee = (int)$context->employee->id;
$cm->id_customer_thread = $ct->id;
$cm->message = Tools::htmlentitiesutf8(nl2br2(Tools::getValue('reply_message')));
$cm->message = Tools::htmlentitiesutf8(Tools::nl2br(Tools::getValue('reply_message')));
$cm->ip_address = ip2long($_SERVER['REMOTE_ADDR']);
if (isset($_FILES) AND !empty($_FILES['joinFile']['name']) AND $_FILES['joinFile']['error'] != 0)
$this->_errors[] = Tools::displayError('An error occurred with the file upload.');
@@ -170,7 +170,7 @@ class AdminCustomerThreads extends AdminTab
$fileAttachment['mime'] = $_FILES['joinFile']['type'];
}
$params = array(
'{reply}' => nl2br2(Tools::getValue('reply_message')),
'{reply}' => Tools::nl2br(Tools::getValue('reply_message')),
'{link}' => Tools::url($context->link->getPageLink('contact', true), 'id_customer_thread='.(int)($ct->id).'&token='.$ct->token),
);
Mail::Send($ct->id_lang, 'reply_msg', Mail::l('An answer to your message is available'), $params, Tools::getValue('msg_email'), NULL, NULL, NULL, $fileAttachment);