aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-06-20 09:35:41 +0200
committerGitHub <noreply@github.com>2016-06-20 09:35:41 +0200
commit3c552f0d0467f641ceb3490b347747d031ac7397 (patch)
treefadab5a5e2744feb46c75ea2c548d3eeb2e6721d
parent77c530f43c8d0efd72c12e0b723982a5377c5bc9 (diff)
parentce0e9ec31bf6b9d144a2bd7dbd3c912ac59539d6 (diff)
downloadwallabag-3c552f0d0467f641ceb3490b347747d031ac7397.tar.gz
wallabag-3c552f0d0467f641ceb3490b347747d031ac7397.tar.zst
wallabag-3c552f0d0467f641ceb3490b347747d031ac7397.zip
Merge pull request #2156 from wallabag/delete-redirect
Try to find bad redirection after delete
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 33b5e2ad..4eb314f7 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -406,7 +406,7 @@ class EntryController extends Controller
406 $url = $this->generateUrl( 406 $url = $this->generateUrl(
407 'view', 407 'view',
408 ['id' => $entry->getId()], 408 ['id' => $entry->getId()],
409 UrlGeneratorInterface::ABSOLUTE_URL 409 UrlGeneratorInterface::ABSOLUTE_PATH
410 ); 410 );
411 411
412 $em = $this->getDoctrine()->getManager(); 412 $em = $this->getDoctrine()->getManager();
@@ -418,8 +418,9 @@ class EntryController extends Controller
418 'flashes.entry.notice.entry_deleted' 418 'flashes.entry.notice.entry_deleted'
419 ); 419 );
420 420
421 // don't redirect user to the deleted entry 421 // don't redirect user to the deleted entry (check that the referer doesn't end with the same url)
422 $to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null); 422 $referer = $request->headers->get('referer');
423 $to = (1 !== preg_match('#'.$url.'$#i', $referer) ? $referer : null);
423 424
424 $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to); 425 $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);
425 426