X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FRepository%2FEntryRepository.php;h=83379998d203bdc2896195da2ab30fe3a4c79004;hb=bafb9744c87255ebe28945879da85e587175d241;hp=749d2338c3b183314d7e9428546cb5f5c90e3d27;hpb=b7c5fda512f29c99db69cb090fafb6f79abf6004;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 749d2338..83379998 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -102,7 +102,7 @@ class EntryRepository extends EntityRepository
     }
 
     /**
-     * Retrieves untagged entries for a user.
+     * Retrieve a sorted list of untagged entries for a user.
      *
      * @param int $userId
      *
@@ -111,8 +111,21 @@ class EntryRepository extends EntityRepository
     public function getBuilderForUntaggedByUser($userId)
     {
         return $this
-            ->getSortedQueryBuilderByUser($userId)
-            ->andWhere('size(e.tags) = 0');
+            ->sortQueryBuilder($this->getRawBuilderForUntaggedByUser($userId));
+    }
+
+    /**
+     * Retrieve untagged entries for a user.
+     *
+     * @param int $userId
+     *
+     * @return QueryBuilder
+     */
+    public function getRawBuilderForUntaggedByUser($userId)
+    {
+        return $this->getQueryBuilderByUser($userId)
+            ->leftJoin('e.tags', 't')
+            ->andWhere('t.id is null');
     }
 
     /**
@@ -416,7 +429,7 @@ class EntryRepository extends EntityRepository
     /**
      * Return a query builder to be used by other getBuilderFor* method.
      *
-     * @param int    $userId
+     * @param int $userId
      *
      * @return QueryBuilder
      */
@@ -437,15 +450,15 @@ class EntryRepository extends EntityRepository
      */
     private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc')
     {
-        return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId));
+        return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId), $sortBy, $direction);
     }
 
     /**
-     * Return the given QueryBuilder with an orderBy() call
-     * 
+     * Return the given QueryBuilder with an orderBy() call.
+     *
      * @param QueryBuilder $qb
-     * @param string $sortBy
-     * @param string $direction
+     * @param string       $sortBy
+     * @param string       $direction
      *
      * @return QueryBuilder
      */