Merge remote-tracking branch 'upstream/develop' into 1704-mastodon

[friendica.git] / include / photos.php

diff --git a/include/photos.php b/include/photos.php
index 02d1b174039f4a1956b03cfb7459c08ff79120e0..e872532a481ae78dd882f5532c6fb36a8fb77c6f 100644 (file)
--- a/include/photos.php
+++ b/include/photos.php
@@ -48,10 +48,10 @@ function photo_albums($uid, $update = false) {
                if (!Config::get('system', 'no_count', false)) {
                        /// @todo This query needs to be renewed. It is really slow
                        // At this time we just store the data in the cache
-                       $albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`
+                       $albums = qu("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
                                FROM `photo`
                                WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
-                               GROUP BY `album`, `created` ORDER BY `created` DESC",
+                               GROUP BY `album` ORDER BY `created` DESC",
                                intval($uid),
                                dbesc('Contact Photos'),
                                dbesc(t('Contact Photos'))
@@ -59,9 +59,8 @@ function photo_albums($uid, $update = false) {
                } else {
                        // This query doesn't do the count and is much faster
                        $albums = qu("SELECT DISTINCT(`album`), '' AS `total`
-                               FROM `photo`
-                               WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
-                               GROUP BY `album`, `created` ORDER BY `created` DESC",
+                               FROM `photo` USE INDEX (`uid_album_scale_created`)
+                               WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
                                intval($uid),
                                dbesc('Contact Photos'),
                                dbesc(t('Contact Photos'))