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

[-] FO : fixed bug #PSCFV-2741

Browse Source
This commit is contained in:
vAugagneur committed 2012-08-08 07:17:03 +00:00
1 parent 538e0d8ea8
commit 19ecceaae8
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminCustomerThreadsController.php
+1 -1
View File
@@ -381,7 +381,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$cm = new CustomerMessage(); $cm = new CustomerMessage();
$cm->id_employee = (int)$this->context->employee->id; $cm->id_employee = (int)$this->context->employee->id;
$cm->id_customer_thread = $ct->id; $cm->id_customer_thread = $ct->id;
$cm->message = Tools::htmlentitiesutf8(Tools::nl2br(Tools::getValue('reply_message'))); $cm->message = Tools::nl2br(Tools::htmlentitiesutf8(Tools::getValue('reply_message')));
$cm->ip_address = ip2long($_SERVER['REMOTE_ADDR']); $cm->ip_address = ip2long($_SERVER['REMOTE_ADDR']);
if (isset($_FILES) && !empty($_FILES['joinFile']['name']) && $_FILES['joinFile']['error'] != 0) if (isset($_FILES) && !empty($_FILES['joinFile']['name']) && $_FILES['joinFile']['error'] != 0)
$this->errors[] = Tools::displayError('An error occurred with the file upload.'); $this->errors[] = Tools::displayError('An error occurred with the file upload.');
themes/default/order-detail.tpl
+1 -1
View File
@@ -371,7 +371,7 @@
{foreach from=$messages item=message name="messageList"} {foreach from=$messages item=message name="messageList"}
<tr class="{if $smarty.foreach.messageList.first}first_item{elseif $smarty.foreach.messageList.last}last_item{/if} {if $smarty.foreach.messageList.index % 2}alternate_item{else}item{/if}"> <tr class="{if $smarty.foreach.messageList.first}first_item{elseif $smarty.foreach.messageList.last}last_item{/if} {if $smarty.foreach.messageList.index % 2}alternate_item{else}item{/if}">
<td> <td>
{if isset($message.ename) && $message.ename} {if isset($message.elastname) && $message.elastname}
{$message.efirstname|escape:'htmlall':'UTF-8'} {$message.elastname|escape:'htmlall':'UTF-8'} {$message.efirstname|escape:'htmlall':'UTF-8'} {$message.elastname|escape:'htmlall':'UTF-8'}
{elseif $message.clastname} {elseif $message.clastname}
{$message.cfirstname|escape:'htmlall':'UTF-8'} {$message.clastname|escape:'htmlall':'UTF-8'} {$message.cfirstname|escape:'htmlall':'UTF-8'} {$message.clastname|escape:'htmlall':'UTF-8'}