Merge pull request #1651 from wallabag/v2-fix-wllbgv2-import

Test if some keys are missing in v2 import

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
             $entry->setContent($importedEntry['content']);
             $entry->setReadingTime($importedEntry['reading_time']);
             $entry->setDomainName($importedEntry['domain_name']);
-            $entry->setMimetype($importedEntry['mimetype']);
-            $entry->setLanguage($importedEntry['language']);
-            $entry->setPreviewPicture($importedEntry['preview_picture']);
+            if (isset($importedEntry['mimetype'])) {
+                $entry->setMimetype($importedEntry['mimetype']);
+            }
+            if (isset($importedEntry['language'])) {
+                $entry->setLanguage($importedEntry['language']);
+            }
+            if (isset($importedEntry['preview_picture'])) {
+                $entry->setPreviewPicture($importedEntry['preview_picture']);
+            }
 
             $this->em->persist($entry);
             ++$this->importedEntries;