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

Merge branch 'master' into storageareas

This commit is contained in:
Isaac Connor 2018-10-24 10:17:27 -04:00
parent ca8770bd5a 6488122862
commit 875bc3caf9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/api/lib/Cake/Network/CakeResponse.php
View File

@ -1168,6 +1168,9 @@ class CakeResponse {
if ($modifiedSince) { if ($modifiedSince) {
$timeMatches = strtotime($this->modified()) === strtotime($modifiedSince); $timeMatches = strtotime($this->modified()) === strtotime($modifiedSince);
} }
if (!isset($etagMatches, $timeMatches)) {
return false;
}
$checks = compact('etagMatches', 'timeMatches'); $checks = compact('etagMatches', 'timeMatches');
if (empty($checks)) { if (empty($checks)) {
return false; return false;

11
web/includes/Group.php
View File

@ -95,13 +95,12 @@ class Group {
} }
} }
} # end if options } # end if options
$groups = array();
$result = dbQuery($sql, $values); $results = dbFetchAll($sql, NULL, $values);
$results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Group'); if ( $results ) {
foreach ( $results as $row => $obj ) { return array_map( function($row){ return new Group($row); }, $results );
$groups[] = $obj;
} }
return $groups; return array();
} # end find() } # end find()
public static function find_one($parameters = null, $options = null) { public static function find_one($parameters = null, $options = null) {