From ebb806496f31e4e6f7d57072a12f87ee1c53a987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nloeuillet@simplonprod.co>
Date: Tue, 16 Mar 2021 10:39:35 +0100
Subject: [PATCH 1/2] Fixed timeout when assigning tags to entry Fix #4998

---
 src/Wallabag/CoreBundle/Entity/Entry.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 0e19a0c20..d44f9a8a0 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -712,7 +712,6 @@ class Entry
         }
 
         $this->tags->add($tag);
-        $tag->addEntry($this);
     }
 
     /**

From c34fe9945a189c936e3fe18140f77ef781c902df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 3 Aug 2021 08:36:56 +0200
Subject: [PATCH 2/2] Fixed test

---
 tests/Wallabag/CoreBundle/Controller/TagControllerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index 5e8f9f3de..8d04f667a 100644
--- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
@@ -195,7 +195,7 @@ class TagControllerTest extends WallabagCoreTestCase
         $entry2 = new Entry($this->getLoggedInUser());
         $entry2->setUrl('http://0.0.0.0/bar');
         $entry2->addTag($tag);
-        $this->getEntityManager()->persist($entry);
+        $this->getEntityManager()->persist($entry2);
 
         $this->getEntityManager()->flush();
         $this->getEntityManager()->clear();