Merge pull request #10857 from annando/no-q

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 46360380438a89d2a039b4bc359f0927ea6cd18c..54316d92efa749d0e9238d0fd3277b98e46fa73b 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -39,8 +39,6 @@ use Friendica\Security\Security;
 use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 
-require_once "include/dba.php";
-
 /**
  * Class to handle photo dabatase table
  */
@@ -653,7 +651,7 @@ class Photo
                                // At this time we just store the data in the cache
                                $albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
                                        FROM `photo`
-                                       WHERE `uid` = ? AND `album` != ? AND `album` != ? $sql_extra
+                                       WHERE `uid` = ? AND NOT `album` IN (?, ?) $sql_extra
                                        GROUP BY `album` ORDER BY `created` DESC",
                                        $uid,
                                        self::CONTACT_PHOTOS,
@@ -663,7 +661,7 @@ class Photo
                                // This query doesn't do the count and is much faster
                                $albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total`
                                        FROM `photo` USE INDEX (`uid_album_scale_created`)
-                                       WHERE `uid` = ? AND `album` != ? AND `album` != ? $sql_extra",
+                                       WHERE `uid` = ? AND NOT `album` IN (?, ?) $sql_extra",
                                        $uid,
                                        self::CONTACT_PHOTOS,
                                        DI::l10n()->t(self::CONTACT_PHOTOS)