Merge pull request #2708 from jcharaoui/import-disablecontentupdate

Import disableContentUpdate

diff --combined src/Wallabag/CoreBundle/Controller/EntryController.php
index 9fe3e69372c294331d6c26b93f093ad3ac4a20a5,4b2bc7da4e8116d58a13a19e0026978ed216e558..fafa49f1b0bb69a156db8318a6ab3e9a9c2bba02
--- 1/src/Wallabag/CoreBundle/Controller/EntryController.php
--- 2/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@@ -53,22 -53,17 +53,17 @@@ class EntryController extends Controlle
  
      /**
       * Fetch content and update entry.
-      * In case it fails, entry will return to avod loosing the data.
+      * In case it fails, $entry->getContent will return an error message.
       *
       * @param Entry  $entry
       * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded
-      *
-      * @return Entry
       */
      private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
      {
-         // put default title in case of fetching content failed
-         $entry->setTitle('No title found');
- 
          $message = 'flashes.entry.notice.'.$prefixMessage;
  
          try {
-             $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
+             $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
          } catch (\Exception $e) {
              $this->get('logger')->error('Error while saving an entry', [
                  'exception' => $e,
@@@ -79,8 -74,6 +74,6 @@@
          }
  
          $this->get('session')->getFlashBag()->add('notice', $message);
- 
-         return $entry;
      }
  
      /**
@@@ -321,7 -314,8 +314,7 @@@
  
          $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
  
 -        $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
 -            ->prepare($pagerAdapter, $page);
 +        $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
  
          try {
              $entries->setCurrentPage($page);