From ced6c63ddd33ae5465af65fd0801cd179e55ab0c Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 5 Dec 2017 15:13:30 -0700 Subject: [PATCH] Fix historylog pagination, found by Filippos Karailanidis --- api/src/Storage/History.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/api/src/Storage/History.php b/api/src/Storage/History.php index 0ed5db8b36..f6bf66a8bf 100644 --- a/api/src/Storage/History.php +++ b/api/src/Storage/History.php @@ -279,10 +279,7 @@ class History } $rows[] = Api\Db::strip_array_keys($row,'history_'); } - if ($mysql_calc_rows) - { - $total = $GLOBALS['egw']->db->query('SELECT FOUND_ROWS()')->fetchColumn(); - } + $total = $GLOBALS['egw']->db->union($_query,__LINE__,__FILE__)->NumRows(); return $total; }