diff --git a/include/upgrader/sql/1da1bcba-15b30765.patch.sql b/include/upgrader/sql/1da1bcba-15b30765.patch.sql new file mode 100644 index 0000000000000000000000000000000000000000..cb37a02f4af2e3c86f0367674454b22554973c3b --- /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 c3986f80922687722184fc90df9bfeb150f5fb71..8ce3946696c8bb959200e3ea2366805eff58efa5 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 6be37af6d3ebdc802140748fc4c4b8b03b333796..6ac95bb523a74be12a537d09a5983e550e49e473 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 29a60022fd9f87dda3a08126c338d76ae84bbef8..11c872a50b9a27b95388705d17ad0d7a43566ad1 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 f2ba0089004eadf073aba84c87f76a33fd6f39a0..f2d0bb5e1095ca82d1a148b11b25f73e9193edf1 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;