Merge pull request #869 from greezybacon/issue/upgrade-banlist-corruption

upgrader: Fix 1.6 banlist corruption on upgrade

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.filter.php

@@ -246,6 +246,7 @@ class Filter {
             return false;
 
         foreach ($this->getRules() as $rule) {
+            if (!isset($how[$rule['h']])) continue;
             list($func, $pos, $neg) = $how[$rule['h']];
             # TODO: convert $what and $rule['v'] to mb_strtoupper and do
             #       case-sensitive, binary-safe comparisons. Would be really

include/upgrader/streams/core/c00511c7-7be60a84.patch.sql

@@ -224,7 +224,7 @@ CREATE TABLE `%TABLE_PREFIX%email_filter_rule` (
 
 -- SYSTEM BAN LIST was the first filter created, with ID of '1'
 INSERT INTO `%TABLE_PREFIX%email_filter_rule` (`filter_id`, `what`, `how`, `val`)
-    SELECT LAST_INSERT_ID(), 'email', 'equals', email FROM `%TABLE_PREFIX%email_banlist`;
+    SELECT LAST_INSERT_ID(), 'email', 'equal', email FROM `%TABLE_PREFIX%email_banlist`;
 
 -- Create table session
 DROP TABLE IF EXISTS `%TABLE_PREFIX%session`;