diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 5ea4fe59d..883ff0ebd 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -792,6 +792,11 @@ class Pref_Filters extends Handler_Protected {
style=\"font-size : 16px; width : 20em;\"
name=\"reg_exp\" value=\"$reg_exp\"/>";
+ print "
";
+ print "";
+ print "";
+
print "
" . __("on field") . " ";
print_select_hash("filter_type", $filter_type, $filter_types,
'dojoType="dijit.form.Select"');
@@ -806,13 +811,6 @@ class Pref_Filters extends Handler_Protected {
'dojoType="dijit.form.FilteringSelect"');
print "";
- print "";
-
- print "";
-
- print "";
-
print "";
print "
";
diff --git a/include/functions.php b/include/functions.php
index 9a855a9bc..682ffd2ee 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3905,6 +3905,8 @@
break;
}
+ if (isset($rule['inverse'])) $qpart = "NOT ($qpart)";
+
if (isset($rule["feed_id"]) && $rule["feed_id"] > 0) {
$qpart .= " AND feed_id = " . db_escape_string($link, $rule["feed_id"]);
}
@@ -3925,8 +3927,6 @@
$qpart .= " AND $cat_qpart";
}
- if (isset($rule['inverse'])) $qpart = "NOT ($qpart)";
-
array_push($query, "($qpart)");
}