From 92d03c065e043e351ddc264d5fda91fad2ce35f3 Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Mon, 2 Jul 2012 09:53:07 -0500
Subject: [PATCH] Use 'cannedResponseId' in the ticket vars
---
include/class.filter.php | 2 +-
include/class.ticket.php | 6 +++---
setup/inc/sql/osticket-v1.7-mysql.sql.md5 | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/class.filter.php b/include/class.filter.php
index 289dfdd70..a749e5eae 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -279,7 +279,7 @@ class Filter {
$ticket['name'] = $email['reply-to-name'];
}
if ($this->getCannedResponse())
- $ticket['canned_response'] = $this->getCannedResponse();
+ $ticket['cannedResponseId'] = $this->getCannedResponse();
}
function update($vars,&$errors){
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 37b39bfda..f3d6daada 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -2006,15 +2006,15 @@ class Ticket{
// If a canned-response is immediately queued for this ticket,
// disable the autoresponse
- if ($vars['canned_response'])
+ if ($vars['cannedResponseId'])
$autorespond=false;
/***** See if we need to send some alerts ****/
$ticket->onNewTicket($vars['message'], $autorespond, $alertstaff);
- if ($vars['canned_response']
- && ($canned = Canned::lookup($vars['canned_response']))) {
+ if ($vars['cannedResponseId']
+ && ($canned = Canned::lookup($vars['cannedResponseId']))) {
$files = array();
foreach ($canned->getAttachments() as $file)
$files[] = $file['id'];
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql.md5 b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
index 5c68be1d0..7363f25c7 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql.md5
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
@@ -1 +1 @@
-b16d6d6021962e9e8674b6a81d9609bd osticket-v1.7-mysql.sql
+b16d6d6021962e9e8674b6a81d9609bd
--
GitLab