diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2016-09-25 16:11:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-25 16:11:06 +0200 |
| commit | 7e98ad962680fac17b3b90ae34b9c6e5afe7636f (patch) | |
| tree | 451f2c7ec7011f1f0ee8911fb1921b02f158e1dc /src/Wallabag/ApiBundle | |
| parent | 9d7dd6b0d2480d3efff5b0ab1461f2ef99bfd57a (diff) | |
| parent | 289875836a09944f5993d33753042abfef13809e (diff) | |
| download | wallabag-7e98ad962680fac17b3b90ae34b9c6e5afe7636f.tar.gz wallabag-7e98ad962680fac17b3b90ae34b9c6e5afe7636f.tar.zst wallabag-7e98ad962680fac17b3b90ae34b9c6e5afe7636f.zip | |
Merge pull request #2308 from wallabag/tags-duplicate
Fix duplicate tags on import
Diffstat (limited to 'src/Wallabag/ApiBundle')
| -rw-r--r-- | src/Wallabag/ApiBundle/Controller/WallabagRestController.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index fb7c6c1f..dd17ef97 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
| @@ -322,9 +322,7 @@ class WallabagRestController extends FOSRestController | |||
| 322 | 322 | ||
| 323 | $tags = $this->getDoctrine() | 323 | $tags = $this->getDoctrine() |
| 324 | ->getRepository('WallabagCoreBundle:Tag') | 324 | ->getRepository('WallabagCoreBundle:Tag') |
| 325 | ->findAllTags($this->getUser()->getId()) | 325 | ->findAllTagsWithEntries($this->getUser()->getId()); |
| 326 | ->getQuery() | ||
| 327 | ->getResult(); | ||
| 328 | 326 | ||
| 329 | $json = $this->get('serializer')->serialize($tags, 'json'); | 327 | $json = $this->get('serializer')->serialize($tags, 'json'); |
| 330 | 328 | ||