Ensure orphan tag are remove in API

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Controller / TagController.php

diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 07cd3edb3e333a1cd7f7ea86de927844d6a4349c..c5746734d398fd2653a64ade83d66d150acbbafe 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -63,10 +63,12 @@ class TagController extends Controller
         $entry->removeTag($tag);
         $em = $this->getDoctrine()->getManager();
         $em->flush();
-        if (count($tag->getEntries()) == 0) {
+
+        // remove orphan tag in case no entries are associated to it
+        if (count($tag->getEntries()) === 0) {
             $em->remove($tag);
+            $em->flush();
         }
-        $em->flush();
 
         $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
 
@@ -122,7 +124,7 @@ class TagController extends Controller
             }
         }
 
-        return $this->render('WallabagCoreBundle:Entry:entries.html.twig',[
+        return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [
             'form' => null,
             'entries' => $entries,
             'currentPage' => $page,