Fix tag count for PostgreSQL

2 files changed, 6 insertions, 8 deletions

diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php
index f5c4ea6a..9d127da7 100644
--- a/src/Wallabag/CoreBundle/Repository/TagRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php
@@ -7,17 +7,17 @@ use Doctrine\ORM\EntityRepository;
 class TagRepository extends EntityRepository
 {
     /**
-     * Find all tags per user.
+     * Count all tags per user.
      *
      * @param int $userId
      * @param int $cacheLifeTime Duration of the cache for this query
      *
-     * @return array
+     * @return int
      */
-    public function findAllTags($userId, $cacheLifeTime = null)
+    public function countAllTags($userId, $cacheLifeTime = null)
     {
         $query = $this->createQueryBuilder('t')
-            ->select('t')
+            ->select('t.slug')
             ->leftJoin('t.entries', 'e')
             ->where('e.user = :userId')->setParameter('userId', $userId)
             ->groupBy('t.slug')
@@ -29,7 +29,7 @@ class TagRepository extends EntityRepository
             $query->setResultCacheLifetime($cacheLifeTime);
         }
 
-        return $query->getArrayResult();
+        return count($query->getArrayResult());
     }
 
     /**
diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
index 45dc591d..fb4c7412 100644
--- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
@@ -104,9 +104,7 @@ class WallabagExtension extends \Twig_Extension implements \Twig_Extension_Globa
             return 0;
         }
 
-        $data = $this->tagRepository->findAllTags($user->getId());
-
-        return count($data);
+        return $this->tagRepository->countAllTags($user->getId());
     }
 
     public function getName()