mirror of
https://github.com/wallabag/wallabag.git
synced 2024-10-31 22:28:54 +00:00
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:
parent
77c530f43c
commit
ce0e9ec31b
1 changed files with 4 additions and 3 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue