Merge branch 'issue/270' into feature/variables-revisited

include/upgrader/sql/1da1bcba-15b30765.patch.sql

+/**
+ * @version v1.7 RC2+
+ * @signature 15b3076533123ff617801d89861136c8
+ *
+ * Transitional patch.
+ *  
+ */
+
+-- Finished with patch
+UPDATE `%TABLE_PREFIX%config`
+    SET `schema_signature`='15b3076533123ff617801d89861136c8';

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

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,

setup/inc/sql/osTicket-mysql.sql.md5

-1da1bcbafcedc65efef58f142a48ac91
+15b3076533123ff617801d89861136c8

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;