From cecd302957e633d0873fa5f048b0c3f4e201f14f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 7 Feb 2017 12:39:29 -0500 Subject: [PATCH 01/16] Fixes #509 Allow customers to respond using rich text --- reply_ticket.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/reply_ticket.php b/reply_ticket.php index 8160c573..e4e96fdf 100644 --- a/reply_ticket.php +++ b/reply_ticket.php @@ -62,12 +62,14 @@ $message = hesk_input(hesk_POST('message')); // If the message was entered, further parse it $modsForHesk_settings = mfh_getSettings(); -if (strlen($message) && !$modsForHesk_settings['rich_text_for_tickets_for_customers']) { - // Make links clickable - $message = hesk_makeURL($message); +if (strlen($message)) { + if (!$modsForHesk_settings['rich_text_for_tickets_for_customers']) { + // Make links clickable + $message = hesk_makeURL($message); - // Turn newlines into
- $message = nl2br($message); + // Turn newlines into
+ $message = nl2br($message); + } } else { $hesk_error_buffer[] = $hesklang['enter_message']; } From d7a25b7c7aad22f719783c63cce68ff9881a94ee Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 7 Feb 2017 13:01:28 -0500 Subject: [PATCH 02/16] Fixes #507 Add back missing create event button --- admin/calendar.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/admin/calendar.php b/admin/calendar.php index 96c98361..281b624d 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -83,7 +83,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');