From 8f0aa0ca5a945d850b30e555c4c3a4dba5cd4c10 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Fri, 12 Jul 2019 22:13:28 +0200 Subject: [PATCH] bugfix: add missing group by parameters --- include/api.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/api.php b/include/api.php index 6c6e6f7dcd..59a95659fb 100644 --- a/include/api.php +++ b/include/api.php @@ -4207,7 +4207,7 @@ function api_fr_photos_list($type) $r = q( "SELECT `resource-id`, MAX(scale) AS `scale`, `album`, `filename`, `type`, MAX(`created`) AS `created`, MAX(`edited`) AS `edited`, MAX(`desc`) AS `desc` FROM `photo` - WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`", + WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`, `album`, `filename`, `type`", intval(local_user()) ); $typetoext = [ @@ -4888,7 +4888,9 @@ function prepare_photo_data($type, $scale, $photo_id) "SELECT %s `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`, `type`, `height`, `width`, `datasize`, `profile`, `allow_cid`, `deny_cid`, `allow_gid`, `deny_gid`, MIN(`scale`) AS `minscale`, MAX(`scale`) AS `maxscale` - FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s GROUP BY `resource-id`", + FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s GROUP BY + `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`, + `type`, `height`, `width`, `datasize`, `profile`, `allow_cid`, `deny_cid`, `allow_gid`, `deny_gid`", $data_sql, intval(local_user()), DBA::escape($photo_id),