From 26a3b7891be612f90308b7ef1ac1aaa06abdb4f8 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 17 Dec 2013 15:59:25 -0600
Subject: [PATCH] upgrader: Fix 1.6 banlist corruption on upgrade
---
include/class.filter.php | 1 +
include/upgrader/streams/core/c00511c7-7be60a84.patch.sql | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/class.filter.php b/include/class.filter.php
index eb865c17a..f2294078a 100644
--- a/include/class.filter.php
+++ b/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
diff --git a/include/upgrader/streams/core/c00511c7-7be60a84.patch.sql b/include/upgrader/streams/core/c00511c7-7be60a84.patch.sql
index e56522724..97c2bf97b 100644
--- a/include/upgrader/streams/core/c00511c7-7be60a84.patch.sql
+++ b/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`;
--
GitLab