diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-05 15:22:51 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-05 15:22:51 +0100 |
commit | ae5b37ef2e52c06182bc6edb14f6b3aae381ddb4 (patch) | |
tree | aa16a6d3322f6516e3302e15b4217eb0d1111807 /src/Wallabag/ImportBundle/Import | |
parent | 565c8efb4fa2e1073f8428f80ff39da2b3e7cec7 (diff) | |
parent | 4c46e2609fe0ebb1f6a4b4b23a3d8647a1d9d9cd (diff) | |
download | wallabag-ae5b37ef2e52c06182bc6edb14f6b3aae381ddb4.tar.gz wallabag-ae5b37ef2e52c06182bc6edb14f6b3aae381ddb4.tar.zst wallabag-ae5b37ef2e52c06182bc6edb14f6b3aae381ddb4.zip |
Merge pull request #1651 from wallabag/v2-fix-wllbgv2-import
Test if some keys are missing in v2 import
Diffstat (limited to 'src/Wallabag/ImportBundle/Import')
-rw-r--r-- | src/Wallabag/ImportBundle/Import/WallabagV2Import.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php index 979c671e..c5c0d5a7 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php +++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php | |||
@@ -56,9 +56,15 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface | |||
56 | $entry->setContent($importedEntry['content']); | 56 | $entry->setContent($importedEntry['content']); |
57 | $entry->setReadingTime($importedEntry['reading_time']); | 57 | $entry->setReadingTime($importedEntry['reading_time']); |
58 | $entry->setDomainName($importedEntry['domain_name']); | 58 | $entry->setDomainName($importedEntry['domain_name']); |
59 | $entry->setMimetype($importedEntry['mimetype']); | 59 | if (isset($importedEntry['mimetype'])) { |
60 | $entry->setLanguage($importedEntry['language']); | 60 | $entry->setMimetype($importedEntry['mimetype']); |
61 | $entry->setPreviewPicture($importedEntry['preview_picture']); | 61 | } |
62 | if (isset($importedEntry['language'])) { | ||
63 | $entry->setLanguage($importedEntry['language']); | ||
64 | } | ||
65 | if (isset($importedEntry['preview_picture'])) { | ||
66 | $entry->setPreviewPicture($importedEntry['preview_picture']); | ||
67 | } | ||
62 | 68 | ||
63 | $this->em->persist($entry); | 69 | $this->em->persist($entry); |
64 | ++$this->importedEntries; | 70 | ++$this->importedEntries; |