diff options
Diffstat (limited to 'src')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php index 3af53805..da361308 100644 --- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php +++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php | |||
@@ -130,7 +130,7 @@ class AnnotationRepository extends EntityRepository | |||
130 | * | 130 | * |
131 | * @return mixed | 131 | * @return mixed |
132 | */ | 132 | */ |
133 | public function findAllByArchivedEntriesAndUserId($userId) | 133 | public function findAllArchivedEntriesByUser($userId) |
134 | { | 134 | { |
135 | return $this->createQueryBuilder('a') | 135 | return $this->createQueryBuilder('a') |
136 | ->leftJoin('a.entry', 'e') | 136 | ->leftJoin('a.entry', 'e') |
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index b2814ade..1a80cc1a 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -329,7 +329,7 @@ class ConfigController extends Controller | |||
329 | */ | 329 | */ |
330 | private function removeTagsForArchivedByUserId($userId) | 330 | private function removeTagsForArchivedByUserId($userId) |
331 | { | 331 | { |
332 | $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findTagsForArchivedArticles($userId); | 332 | $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findForArchivedArticlesByUser($userId); |
333 | $this->removeAllTagsByStatusAndUserId($tags, $userId); | 333 | $this->removeAllTagsByStatusAndUserId($tags, $userId); |
334 | } | 334 | } |
335 | 335 | ||
@@ -339,7 +339,7 @@ class ConfigController extends Controller | |||
339 | 339 | ||
340 | $archivedEntriesAnnotations = $this->getDoctrine() | 340 | $archivedEntriesAnnotations = $this->getDoctrine() |
341 | ->getRepository('WallabagAnnotationBundle:Annotation') | 341 | ->getRepository('WallabagAnnotationBundle:Annotation') |
342 | ->findAllByArchivedEntriesAndUserId($userId); | 342 | ->findAllArchivedEntriesByUser($userId); |
343 | 343 | ||
344 | foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) { | 344 | foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) { |
345 | $em->remove($archivedEntriesAnnotation); | 345 | $em->remove($archivedEntriesAnnotation); |
diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php index b78e244e..6c63a6a2 100644 --- a/src/Wallabag/CoreBundle/Repository/TagRepository.php +++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php | |||
@@ -77,7 +77,7 @@ class TagRepository extends EntityRepository | |||
77 | ->getSingleResult(); | 77 | ->getSingleResult(); |
78 | } | 78 | } |
79 | 79 | ||
80 | public function findTagsForArchivedArticles($userId) | 80 | public function findForArchivedArticlesByUser($userId) |
81 | { | 81 | { |
82 | $ids = $this->createQueryBuilder('t') | 82 | $ids = $this->createQueryBuilder('t') |
83 | ->select('t.id') | 83 | ->select('t.id') |