diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-10-21 15:12:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-21 15:12:29 +0200 |
commit | 49dee2d2de63af36248e92ce740da2692358280e (patch) | |
tree | 01649e5e6fcfeadeb61cc56408a03658be85a69a /src/Wallabag/CoreBundle/Controller | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
parent | f6798f69c3f3d6f4f8295f8168785ade6f1f125a (diff) | |
download | wallabag-49dee2d2de63af36248e92ce740da2692358280e.tar.gz wallabag-49dee2d2de63af36248e92ce740da2692358280e.tar.zst wallabag-49dee2d2de63af36248e92ce740da2692358280e.zip |
Merge pull request #2482 from wallabag/avoid-bad-refresh
If reload content failed, don’t update it
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 3b28e635..97bb3d12 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -330,6 +330,15 @@ class EntryController extends Controller | |||
330 | 330 | ||
331 | $this->updateEntry($entry, 'entry_reloaded'); | 331 | $this->updateEntry($entry, 'entry_reloaded'); |
332 | 332 | ||
333 | // if refreshing entry failed, don't save it | ||
334 | if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) { | ||
335 | $bag = $this->get('session')->getFlashBag(); | ||
336 | $bag->clear(); | ||
337 | $bag->add('notice', 'flashes.entry.notice.entry_reloaded_failed'); | ||
338 | |||
339 | return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); | ||
340 | } | ||
341 | |||
333 | $em = $this->getDoctrine()->getManager(); | 342 | $em = $this->getDoctrine()->getManager(); |
334 | $em->persist($entry); | 343 | $em->persist($entry); |
335 | $em->flush(); | 344 | $em->flush(); |