From d0a24ae32be103e1d73aafd7933d2536bd5467f9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 5 Jun 2020 18:01:20 -0400
Subject: [PATCH] Make all Filters operate on in-progress events
---
scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 21803d76a..95cad2982 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -324,14 +324,9 @@ sub Sql {
} # end if terms
if ( $self->{Sql} ) {
- if ( $self->{AutoMessage} ) {
# Include all events, including events that are still ongoing
# and have no EndTime yet
- $sql .= ' WHERE ( '.$self->{Sql}.' )';
- } else {
-# Only include closed events (events with valid EndTime)
- $sql .= ' WHERE (E.EndTime IS NOT NULL) AND ( '.$self->{Sql}.' )';
- }
+ $sql .= ' WHERE ( '.$self->{Sql}.' )';
}
my @auto_terms;
if ( $self->{AutoArchive} ) {