X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FConfigController.php;h=d40efcd73cfe5bf88845af30e29072d915677b79;hb=e61ee56031aa0788f9a40ec245d3c391d219d6c2;hp=faa85d1686919b15bfb7d064e4cfc22889770389;hpb=191564b7f71d01fb4c597c9b9641e23db564278d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index faa85d16..d40efcd7 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -149,6 +149,7 @@ class ConfigController extends Controller
                 'token' => $config->getRssToken(),
             ],
             'twofactor_auth' => $this->getParameter('twofactor_auth'),
+            'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
             'enabled_users' => $this->getDoctrine()
                 ->getRepository('WallabagUserBundle:User')
                 ->getSumEnabledUsers(),
@@ -251,9 +252,11 @@ class ConfigController extends Controller
                 // otherwise they won't be removed ...
                 if ($this->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
                     $this->getDoctrine()->getRepository('WallabagAnnotationBundle:Annotation')->removeAllByUserId($this->getUser()->getId());
-                    $this->removeAllTagsByUserId($this->getUser()->getId());
                 }
 
+                // manually remove tags to avoid orphan tag
+                $this->removeAllTagsByUserId($this->getUser()->getId());
+
                 $this->getDoctrine()
                     ->getRepository('WallabagCoreBundle:Entry')
                     ->removeAllByUserId($this->getUser()->getId());
@@ -268,9 +271,9 @@ class ConfigController extends Controller
     }
 
     /**
-     * Remove all tags for a given user.
+     * Remove all tags for a given user and cleanup orphan tags.
      *
-     * @param  int $userId
+     * @param int $userId
      */
     private function removeAllTagsByUserId($userId)
     {
@@ -283,6 +286,17 @@ class ConfigController extends Controller
         $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
             ->removeTags($userId, $tags);
+
+        // cleanup orphan tags
+        $em = $this->getDoctrine()->getManager();
+
+        foreach ($tags as $tag) {
+            if (count($tag->getEntries()) === 0) {
+                $em->remove($tag);
+            }
+        }
+
+        $em->flush();
     }
 
     /**