devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2156 from wallabag/delete-redirect 

Try to find bad redirection after delete
This commit is contained in:
Nicolas Lœuillet 2016-06-20 09:35:41 +02:00 committed by GitHub
parent 77c530f43c ce0e9ec31b
commit 3c552f0d04
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Wallabag/CoreBundle/Controller/EntryController.php
View File

@ -406,7 +406,7 @@ class EntryController extends Controller
$url = $this->generateUrl( $url = $this->generateUrl(
'view', 'view',
['id' => $entry->getId()], ['id' => $entry->getId()],
UrlGeneratorInterface::ABSOLUTE_URL UrlGeneratorInterface::ABSOLUTE_PATH
); );
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
@ -418,8 +418,9 @@ class EntryController extends Controller
'flashes.entry.notice.entry_deleted' 'flashes.entry.notice.entry_deleted'
); );
// don't redirect user to the deleted entry // don't redirect user to the deleted entry (check that the referer doesn't end with the same url)
$to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null); $referer = $request->headers->get('referer');
$to = (1 !== preg_match('#'.$url.'$#i', $referer) ? $referer : null);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to); $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);