diff --git a/include/class.filter.php b/include/class.filter.php index 289dfdd704fbbb73547d14faa49ada14274a1a7d..a749e5eaeabc6c08d0a44d29fa30782511313bac 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 37b39bfda98fc70dc8eb3c44e16be66568ff2df4..f3d6daada7859b71281f64dd8c8cd46c2a5cd1be 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 5c68be1d02904ba1ab89108726da629a9394ae99..7363f25c71c7234c4ca996b2a378781e4cec297f 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