mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-08-07 02:32:32 -04:00
handle sort_asc not being set. Handle term['val'] not being set.
This commit is contained in:
1 parent
a25c3dfb5c
commit
2d748091a2
1 file changed
+2
-1
@@ -1065,7 +1065,7 @@ function parseSort($saveToSession=false, $querySep='&') {
|
||||
$sortColumn = 'E.StartTime';
|
||||
break;
|
||||
}
|
||||
if ( !$_REQUEST['sort_asc'] )
|
||||
if ( !isset($_REQUEST['sort_asc']) )
|
||||
$_REQUEST['sort_asc'] = 0;
|
||||
$sortOrder = $_REQUEST['sort_asc'] ? 'asc' : 'desc';
|
||||
$sortQuery = $querySep.'sort_field='.validHtmlStr($_REQUEST['sort_field']).$querySep.'sort_asc='.validHtmlStr($_REQUEST['sort_asc']);
|
||||
@@ -1235,6 +1235,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&') {
|
||||
break;
|
||||
}
|
||||
$valueList = array();
|
||||
if ( !isset($term['val']) ) $term['val'] = '';
|
||||
foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
|
||||
switch ( $term['attr'] ) {
|
||||
|
||||
|
||||
Reference in new issue
Block a user