ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3424 from r01k/master 

Fixed in export.php "Class 'Filter' not found" and SQL query with wrong syntax
This commit is contained in:
Isaac Connor 2022-02-10 21:39:50 -05:00 committed by GitHub
parent 4507b06e29 02d896abe2
commit b700e7b5ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/skins/classic/views/export.php
View File

@ -86,7 +86,7 @@ $limitQuery = '';
if ( $user['MonitorIds'] ) {
$user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')';
$eventsSql .= $user_monitor_ids;
} else {
} else if ( !isset($_REQUEST['filter']) ) {
$eventsSql .= ' 1';
}
@ -98,7 +98,7 @@ if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
$eventsValues += $_REQUEST['eids'];
} else if ( isset($_REQUEST['filter']) ) {
parseSort();
$filter = Filter::parse($_REQUEST['filter']);
$filter = ZM\Filter::parse($_REQUEST['filter']);
$filterQuery = $filter->querystring();
if ( $filter->sql() ) {