From 61e7a44f970e5e57617e83805856c06db6a3c64a Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Mon, 10 Sep 2012 12:56:02 -0400
Subject: [PATCH] Fix missed table name change - a bug on new installations
---
include/upgrader/sql/1da1bcba-15b30765.patch.sql | 11 +++++++++++
main.inc.php | 4 ++--
setup/inc/sql/osTicket-mysql.sql | 2 +-
setup/inc/sql/osTicket-mysql.sql.md5 | 2 +-
setup/setup.inc.php | 2 +-
5 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 include/upgrader/sql/1da1bcba-15b30765.patch.sql
diff --git a/include/upgrader/sql/1da1bcba-15b30765.patch.sql b/include/upgrader/sql/1da1bcba-15b30765.patch.sql
new file mode 100644
index 000000000..cb37a02f4
--- /dev/null
+++ b/include/upgrader/sql/1da1bcba-15b30765.patch.sql
@@ -0,0 +1,11 @@
+/**
+ * @version v1.7 RC2+
+ * @signature 15b3076533123ff617801d89861136c8
+ *
+ * Transitional patch.
+ *
+ */
+
+-- Finished with patch
+UPDATE `%TABLE_PREFIX%config`
+ SET `schema_signature`='15b3076533123ff617801d89861136c8';
diff --git a/main.inc.php b/main.inc.php
index c3986f809..8ce394669 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -62,8 +62,8 @@
/*############## Do NOT monkey with anything else beyond this point UNLESS you really know what you are doing ##############*/
#Current version && schema signature (Changes from version to version)
- define('THIS_VERSION','1.7-RC2'); //Shown on admin panel
- define('SCHEMA_SIGNATURE','1da1bcbafcedc65efef58f142a48ac91'); //MD5 signature of the db schema. (used to trigger upgrades)
+ define('THIS_VERSION','1.7-RC2+'); //Shown on admin panel
+ define('SCHEMA_SIGNATURE','15b3076533123ff617801d89861136c8'); //MD5 signature of the db schema. (used to trigger upgrades)
#load config info
$configfile='';
if(file_exists(ROOT_DIR.'ostconfig.php')) //Old installs prior to v 1.6 RC5
diff --git a/setup/inc/sql/osTicket-mysql.sql b/setup/inc/sql/osTicket-mysql.sql
index 6be37af6d..6ac95bb52 100644
--- a/setup/inc/sql/osTicket-mysql.sql
+++ b/setup/inc/sql/osTicket-mysql.sql
@@ -261,7 +261,7 @@ INSERT INTO `%TABLE_PREFIX%filter` (
VALUES (1, 1, 99, 1, 'SYSTEM BAN LIST', 'Internal list for email banning. Do not remove', NOW());
DROP TABLE IF EXISTS `%TABLE_PREFIX%filter_rule`;
-CREATE TABLE `%TABLE_PREFIX%email_filter_rule` (
+CREATE TABLE `%TABLE_PREFIX%filter_rule` (
`id` int(11) unsigned NOT NULL auto_increment,
`filter_id` int(10) unsigned NOT NULL default '0',
`what` enum('name','email','subject','body','header') NOT NULL,
diff --git a/setup/inc/sql/osTicket-mysql.sql.md5 b/setup/inc/sql/osTicket-mysql.sql.md5
index 29a60022f..11c872a50 100644
--- a/setup/inc/sql/osTicket-mysql.sql.md5
+++ b/setup/inc/sql/osTicket-mysql.sql.md5
@@ -1 +1 @@
-1da1bcbafcedc65efef58f142a48ac91
+15b3076533123ff617801d89861136c8
diff --git a/setup/setup.inc.php b/setup/setup.inc.php
index f2ba00890..f2d0bb5e1 100644
--- a/setup/setup.inc.php
+++ b/setup/setup.inc.php
@@ -15,7 +15,7 @@
**********************************************************************/
#This version - changed on every release
-define('THIS_VERSION', '1.7-RC2');
+define('THIS_VERSION', '1.7-RC2+');
#inits - error reporting.
$error_reporting = E_ALL & ~E_NOTICE;
--
GitLab