Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / src / Wallabag / AnnotationBundle / Repository / AnnotationRepository.php

diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
index 3af53805bd1a9db1741525ffc801b6a1696c9334..da3613089ced7a19d5e6b74961dc251c39a233b1 100644 (file)
--- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
+++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
@@ -130,7 +130,7 @@ class AnnotationRepository extends EntityRepository
      *
      * @return mixed
      */
-    public function findAllByArchivedEntriesAndUserId($userId)
+    public function findAllArchivedEntriesByUser($userId)
     {
         return $this->createQueryBuilder('a')
             ->leftJoin('a.entry', 'e')