Merge remote-tracking branch 'origin/master' into 2.4

2019-01-15 09:41:18 +01:00
parent 5c331bf0f9 f6b9e883c0
commit 5419a8368e
61 changed files with 3813 additions and 1509 deletions
--- a/src/Wallabag/ImportBundle/Import/InstapaperImport.php
+++ b/src/Wallabag/ImportBundle/Import/InstapaperImport.php
@ -105,6 +105,18 @@ class InstapaperImport extends AbstractImport
        return true;
    }

+    /**
+     * {@inheritdoc}
+     */
+    public function validateEntry(array $importedEntry)
+    {
+        if (empty($importedEntry['url'])) {
+            return false;
+        }
+
+        return true;
+    }
+
    /**
     * {@inheritdoc}
     */