It is better this way

[friendica.git] / include / photos.php

diff --git a/include/photos.php b/include/photos.php
index 7cdd14bf6d3e586894748de06292c933f7173058..38cda3f2bab189399d1c437f33fa10fa27be788e 100644 (file)
--- a/include/photos.php
+++ b/include/photos.php
@@ -4,8 +4,8 @@
  * @brief Functions related to photo handling.
  */
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function getGps($exifCoord, $hemi) {
        $degrees = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0;
@@ -48,8 +48,8 @@ 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`
-                               FROM `photo` USE INDEX (`uid_album_created`)
+                       $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` ORDER BY `created` DESC",
                                intval($uid),
@@ -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` USE INDEX (`uid_album_created`)
-                               WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
-                               GROUP BY `album` 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'))