aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle/Import
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-09-25 16:11:06 +0200
committerGitHub <noreply@github.com>2016-09-25 16:11:06 +0200
commit7e98ad962680fac17b3b90ae34b9c6e5afe7636f (patch)
tree451f2c7ec7011f1f0ee8911fb1921b02f158e1dc /src/Wallabag/ImportBundle/Import
parent9d7dd6b0d2480d3efff5b0ab1461f2ef99bfd57a (diff)
parent289875836a09944f5993d33753042abfef13809e (diff)
downloadwallabag-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/ImportBundle/Import')
-rw-r--r--src/Wallabag/ImportBundle/Import/PocketImport.php3
-rw-r--r--src/Wallabag/ImportBundle/Import/WallabagImport.php3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index e00eb44b..327e2500 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -227,7 +227,8 @@ class PocketImport extends AbstractImport
227 if (isset($importedEntry['tags']) && !empty($importedEntry['tags'])) { 227 if (isset($importedEntry['tags']) && !empty($importedEntry['tags'])) {
228 $this->contentProxy->assignTagsToEntry( 228 $this->contentProxy->assignTagsToEntry(
229 $entry, 229 $entry,
230 array_keys($importedEntry['tags']) 230 array_keys($importedEntry['tags']),
231 $this->em->getUnitOfWork()->getScheduledEntityInsertions()
231 ); 232 );
232 } 233 }
233 234
diff --git a/src/Wallabag/ImportBundle/Import/WallabagImport.php b/src/Wallabag/ImportBundle/Import/WallabagImport.php
index 043bb0a2..3754e4a9 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagImport.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagImport.php
@@ -111,7 +111,8 @@ abstract class WallabagImport extends AbstractImport
111 if (array_key_exists('tags', $data)) { 111 if (array_key_exists('tags', $data)) {
112 $this->contentProxy->assignTagsToEntry( 112 $this->contentProxy->assignTagsToEntry(
113 $entry, 113 $entry,
114 $data['tags'] 114 $data['tags'],
115 $this->em->getUnitOfWork()->getScheduledEntityInsertions()
115 ); 116 );
116 } 117 }
117 118