From 2aa7293326a4cd93fa77f1e5931ccaaea9ff77e8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Nov 2021 17:23:23 -0400
Subject: [PATCH] Fix event listing when not paginated.

---
 web/ajax/events.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/ajax/events.php b/web/ajax/events.php
index 6d87da869..4e364242a 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -239,15 +239,17 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
     } # end if search
 
     $sql = 'SELECT ' .$col_str. ' FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE '.$search_filter->sql().' ORDER BY ' .$sort. ' ' .$order;
-    ZM\Debug('Calling the following sql query: ' .$sql);
     $filtered_rows = dbFetchAll($sql);
-    ZM\Debug('Have ' . count($filtered_rows) . ' events matching search filter.');
+    ZM\Debug('Have ' . count($filtered_rows) . ' events matching search filter: '.$sql);
   } else {
     $filtered_rows = $unfiltered_rows;
   } # end if search_filter->terms() > 1
 
+  if ($limit) 
+    $filtered_rows = array_slice($filtered_rows, $offset, $limit);
+
   $returned_rows = array();
-  foreach ( array_slice($filtered_rows, $offset, $limit) as $row ) {
+  foreach ($filtered_rows as $row) {
     $event = new ZM\Event($row);
 
     $scale = intval(5*100*ZM_WEB_LIST_THUMB_WIDTH / $event->Width());