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

Try to find bad redirection after delete 

Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
This commit is contained in:
Jeremy Benoist 2016-06-17 22:18:48 +02:00 committed by Thomas Citharel
parent 11493858a7
commit 4e411208cc
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(
'view',
['id' => $entry->getId()],
UrlGeneratorInterface::ABSOLUTE_URL
UrlGeneratorInterface::ABSOLUTE_PATH
);
$em = $this->getDoctrine()->getManager();
@ -418,8 +418,9 @@ class EntryController extends Controller
'flashes.entry.notice.entry_deleted'
);
// don't redirect user to the deleted entry
$to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null);
// don't redirect user to the deleted entry (check that the referer doesn't end with the same url)
$referer = $request->headers->get('referer');
$to = (1 !== preg_match('#'.$url.'$#i', $referer) ? $referer : null);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);