diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl b/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl index fb68b64e7..6cb1f5885 100644 --- a/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customer_threads/helpers/view/view.tpl @@ -111,8 +111,8 @@ {l s="Choose a template"} --> - - + + diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index b823f98a1..95bbe3d36 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -703,13 +703,13 @@ {* Order Internal notes *} - {if (sizeof($messages))} + {if isset($messages) && $messages}
{$message['message']|escape:'html':'UTF-8'|nl2br} @@ -726,6 +726,7 @@ {/if}
Message from a customer
- You have received a new message regarding order with the reference {order_name}.