mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-07 08:35:53 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #777 WS categories getImages, TotalCount for correct pagination builder

Browse source
This commit is contained in:
modus75 2017-09-30 16:19:35 +02:00
parent a335d70418
commit 164b59588c
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/ws_functions/pwg.categories.php
View file

@ -94,7 +94,7 @@ SELECT id, name, permalink, image_order
$order_by = empty($order_by) ? $conf['order_by'] : 'ORDER BY '.$order_by; $order_by = empty($order_by) ? $conf['order_by'] : 'ORDER BY '.$order_by;
$query = ' $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 FROM '. IMAGES_TABLE .' i
INNER JOIN '. IMAGE_CATEGORY_TABLE .' ON i.id=image_id INNER JOIN '. IMAGE_CATEGORY_TABLE .' ON i.id=image_id
WHERE '. implode("\n AND ", $where_clauses) .' 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( return array(
'paging' => new PwgNamedStruct( 'paging' => new PwgNamedStruct(
array( array(
'page' => $params['page'], 'page' => $params['page'],
'per_page' => $params['per_page'], 'per_page' => $params['per_page'],
'count' => count($images) 'count' => $total_images
) )
), ),
'images' => new PwgNamedArray( 'images' => new PwgNamedArray(