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

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Import / AbstractImport.php

diff --git a/src/Wallabag/ImportBundle/Import/AbstractImport.php b/src/Wallabag/ImportBundle/Import/AbstractImport.php
index 167853aaef541b8955c8cd6ab0a63e2198f81159..9b6242967bc66074e1bfc18b4032268fe4da5e15 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/AbstractImport.php
+++ b/src/Wallabag/ImportBundle/Import/AbstractImport.php
@@ -24,7 +24,7 @@ abstract class AbstractImport implements ImportInterface
     protected $producer;
     protected $user;
     protected $markAsRead;
-    protected $disableContentUpdate;
+    protected $disableContentUpdate = false;
     protected $skippedEntries = 0;
     protected $importedEntries = 0;
     protected $queuedEntries = 0;
@@ -88,7 +88,7 @@ abstract class AbstractImport implements ImportInterface
     /**
      * Set whether articles should be fetched for updated content.
      *
-     * @param bool $markAsRead
+     * @param bool $disableContentUpdate
      */
     public function setDisableContentUpdate($disableContentUpdate)
     {
@@ -97,15 +97,6 @@ abstract class AbstractImport implements ImportInterface
         return $this;
     }
 
-    /**
-     * Get whether articles should be fetched for updated content.
-     */
-    public function getDisableContentUpdate()
-    {
-        return $this->disableContentUpdate;
-    }
-
-
     /**
      * Fetch content from the ContentProxy (using graby).
      * If it fails return the given entry to be saved in all case (to avoid user to loose the content).
@@ -117,10 +108,10 @@ abstract class AbstractImport implements ImportInterface
     protected function fetchContent(Entry $entry, $url, array $content = [])
     {
         try {
-            $this->contentProxy->importEntry($entry, $content, $this->disableContentUpdate);
+            $this->contentProxy->updateEntry($entry, $url, $content, $this->disableContentUpdate);
         } catch (\Exception $e) {
             $this->logger->error('Error trying to import an entry.', [
-                'entry_url' => $content['url'],
+                'entry_url' => $url,
                 'error_msg' => $e->getMessage(),
             ]);
         }