diff options
| author | root | 2019-02-19 18:53:50 +0100 |
|---|---|---|
| committer | root | 2019-02-19 18:53:50 +0100 |
| commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
| tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /inc/paginate.inc.php | |
| parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
| parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
| download | slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.gz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.xz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.zip | |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'inc/paginate.inc.php')
| -rw-r--r-- | inc/paginate.inc.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/paginate.inc.php b/inc/paginate.inc.php index cdb4adf1..b212e252 100644 --- a/inc/paginate.inc.php +++ b/inc/paginate.inc.php @@ -65,8 +65,6 @@ class Paginate $countQuery = preg_replace('/ORDER\s+BY\s.*?(\sASC|\sDESC|$)/is', '', $this->query); $countQuery = preg_replace('/SELECT\s.*?\sFROM\s/is', 'SELECT Count(*) AS rowcount FROM ', $countQuery); $countRes = Database::queryFirst($countQuery, $args); - $args['limit_start'] = $this->currentPage; - $args['limit_count'] = $this->perPage; $query = $this->query . ' LIMIT ' . ($this->currentPage * $this->perPage) . ', ' . $this->perPage; $retval = Database::simpleQuery($query, $args); $this->totalRows = (int)$countRes['rowcount']; |