From 6ed9dc57299ac7265f4f3e63d6ab855715bf1798 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 30 Mar 2022 14:19:40 +1100 Subject: [PATCH] Improve formatting of support messages --- app/Mail/SupportMessageSent.php | 2 +- resources/views/email/support/message.blade.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index 37952b73c1e0..57fdfe67a78e 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -46,7 +46,7 @@ class SupportMessageSent extends Mailable $log_file->seek(PHP_INT_MAX); $last_line = $log_file->key(); - $lines = new LimitIterator($log_file, $last_line - 100, $last_line); + $lines = new LimitIterator($log_file, max(0,$last_line - 100), $last_line); $log_lines = iterator_to_array($lines); } diff --git a/resources/views/email/support/message.blade.php b/resources/views/email/support/message.blade.php index 7ecc3d7b0531..332f9888e252 100644 --- a/resources/views/email/support/message.blade.php +++ b/resources/views/email/support/message.blade.php @@ -1,6 +1,8 @@ @component('email.template.admin', ['settings' => $settings, 'logo' => $logo ?? 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png']) {{-- Body --}} - {{ $support_message }} + {!! $support_message !!} + +
{!! str_replace('\n', '
', $system_info) !!}