From 2ef1e088a57a14f6f9fed9c06efd199d76e5a884 Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Mon, 2 Jul 2012 09:45:54 -0500
Subject: [PATCH] Rename canned_response to canned_response_id
---
include/class.filter.php | 4 ++--
...19dc97d-71e05961.patch.sql => b19dc97d-b16d6d60.patch.sql} | 2 +-
setup/inc/sql/osticket-v1.7-mysql.sql | 2 +-
setup/inc/sql/osticket-v1.7-mysql.sql.md5 | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename setup/inc/sql/{b19dc97d-71e05961.patch.sql => b19dc97d-b16d6d60.patch.sql} (82%)
diff --git a/include/class.filter.php b/include/class.filter.php
index 396d45050..289dfdd70 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -100,7 +100,7 @@ class Filter {
}
function getCannedResponse() {
- return $this->ht['canned_response'];
+ return $this->ht['canned_response_id'];
}
function stopOnMatch(){
@@ -401,7 +401,7 @@ class Filter {
',reject_email='.db_input(isset($vars['reject_email'])?1:0).
',use_replyto_email='.db_input(isset($vars['use_replyto_email'])?1:0).
',disable_autoresponder='.db_input(isset($vars['disable_autoresponder'])?1:0).
- ',canned_response='.db_input($vars['canned_response']).
+ ',canned_response_id='.db_input($vars['canned_response']).
',notes='.db_input($vars['notes']);
diff --git a/setup/inc/sql/b19dc97d-71e05961.patch.sql b/setup/inc/sql/b19dc97d-b16d6d60.patch.sql
similarity index 82%
rename from setup/inc/sql/b19dc97d-71e05961.patch.sql
rename to setup/inc/sql/b19dc97d-b16d6d60.patch.sql
index 2dde76625..2420917bf 100644
--- a/setup/inc/sql/b19dc97d-71e05961.patch.sql
+++ b/setup/inc/sql/b19dc97d-b16d6d60.patch.sql
@@ -5,7 +5,7 @@
*/
ALTER TABLE `%TABLE_PREFIX%email_filter`
- ADD `canned_response` int(11) unsigned NOT NULL default '0'
+ ADD `canned_response_id` int(11) unsigned NOT NULL default '0'
AFTER `disable_autoresponder`;
-- Finished with patch
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql b/setup/inc/sql/osticket-v1.7-mysql.sql
index 54b4b5442..9d3fa288e 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql
@@ -237,7 +237,7 @@ CREATE TABLE `%TABLE_PREFIX%email_filter` (
`reject_email` tinyint(1) unsigned NOT NULL default '0',
`use_replyto_email` tinyint(1) unsigned NOT NULL default '0',
`disable_autoresponder` tinyint(1) unsigned NOT NULL default '0',
- `canned_response` int(11) unsigned NOT NULL default '0',
+ `canned_response_id` int(11) unsigned NOT NULL default '0',
`email_id` int(10) unsigned NOT NULL default '0',
`priority_id` int(10) unsigned NOT NULL default '0',
`dept_id` int(10) unsigned NOT NULL default '0',
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql.md5 b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
index b9831f788..5c68be1d0 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql.md5
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
@@ -1 +1 @@
-71e05961fdb7a993a21704ae513512bc
+b16d6d6021962e9e8674b6a81d9609bd osticket-v1.7-mysql.sql
--
GitLab