From 164b59588c2bf5059a3d77aae2f2e3925cadc4e5 Mon Sep 17 00:00:00 2001 From: modus75 Date: Sat, 30 Sep 2017 16:19:35 +0200 Subject: [PATCH] fixes #777 WS categories getImages, TotalCount for correct pagination builder --- include/ws_functions/pwg.categories.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/ws_functions/pwg.categories.php b/include/ws_functions/pwg.categories.php index 09958ad12..b233af02f 100644 --- a/include/ws_functions/pwg.categories.php +++ b/include/ws_functions/pwg.categories.php @@ -94,7 +94,7 @@ SELECT id, name, permalink, image_order $order_by = empty($order_by) ? $conf['order_by'] : 'ORDER BY '.$order_by; $query = ' -SELECT i.*, GROUP_CONCAT(category_id) AS cat_ids +SELECT SQL_CALC_FOUND_ROWS i.*, GROUP_CONCAT(category_id) AS cat_ids FROM '. IMAGES_TABLE .' i INNER JOIN '. IMAGE_CATEGORY_TABLE .' ON i.id=image_id WHERE '. implode("\n AND ", $where_clauses) .' @@ -152,12 +152,14 @@ SELECT i.*, GROUP_CONCAT(category_id) AS cat_ids } } + list($total_images) = pwg_db_fetch_row(pwg_query('SELECT FOUND_ROWS()')); + return array( 'paging' => new PwgNamedStruct( array( 'page' => $params['page'], 'per_page' => $params['per_page'], - 'count' => count($images) + 'count' => $total_images ) ), 'images' => new PwgNamedArray(