From 2d0f3ce037ec5275fb4a7ea88c87f9ef60247763 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 27 May 2015 21:52:26 -0400 Subject: [PATCH] Closes #226 Fix attachments for creating new tickets --- inc/email_functions.inc.php | 1 + submit_ticket.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php index 1aa7597f..ab8655cf 100644 --- a/inc/email_functions.inc.php +++ b/inc/email_functions.inc.php @@ -228,6 +228,7 @@ function hesk_notifyStaff($email_template,$sql_where,$is_ticket=1) /* Make sure each user gets email in his/her preferred language */ $current_language = 'NONE'; $recipients = array(); + $hasMessage = hesk_doesTemplateHaveTag($email_template,'%%MESSAGE%%'); /* Loop through staff */ foreach ($admins as $admin) diff --git a/submit_ticket.php b/submit_ticket.php index 44e6774f..89b7ffcc 100644 --- a/submit_ticket.php +++ b/submit_ticket.php @@ -423,7 +423,7 @@ if ($hesk_settings['attachments']['use'] && ! empty($attachments) ) foreach ($attachments as $myatt) { hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."attachments` (`ticket_id`,`saved_name`,`real_name`,`size`) VALUES ('".hesk_dbEscape($tmpvar['trackid'])."','".hesk_dbEscape($myatt['saved_name'])."','".hesk_dbEscape($myatt['real_name'])."','".intval($myatt['size'])."')"); - $tmpvar['attachments'] .= hesk_dbInsertID() . '#' . $myatt['real_name'] .','; + $tmpvar['attachments'] .= hesk_dbInsertID() . '#' . $myatt['real_name'] . '#' . $myatt['saved_name'] .','; } }