Merge pull request #1130 from laf/issue-1129

Moved sql where line to be included in count
This commit is contained in:
Paul Gear
2015-05-26 20:43:33 +10:00

View File

@ -16,14 +16,14 @@ if (!isset($sort) || empty($sort)) {
$sort = 'last_polled_timetaken DESC';
}
$sql .= " AND D.status ='1' AND D.ignore='0' AND D.disabled='0' ORDER BY $sort";
$count_sql = "SELECT COUNT(`D`.`device_id`) $sql";
$total = dbFetchCell($count_sql);
if (empty($total)) {
$total = 0;
}
$sql .= " AND D.status ='1' AND D.ignore='0' AND D.disabled='0' ORDER BY $sort";
if (isset($current)) {
$limit_low = ($current * $rowCount) - ($rowCount);
$limit_high = $rowCount;