diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 14 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/TagController.php | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 17b72bd1..69dfd4b1 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -344,7 +344,9 @@ class EntryController extends Controller | |||
344 | $message | 344 | $message |
345 | ); | 345 | ); |
346 | 346 | ||
347 | return $this->redirect($request->headers->get('referer')); | 347 | $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer')); |
348 | |||
349 | return $this->redirect($redirectUrl); | ||
348 | } | 350 | } |
349 | 351 | ||
350 | /** | 352 | /** |
@@ -374,7 +376,9 @@ class EntryController extends Controller | |||
374 | $message | 376 | $message |
375 | ); | 377 | ); |
376 | 378 | ||
377 | return $this->redirect($request->headers->get('referer')); | 379 | $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer')); |
380 | |||
381 | return $this->redirect($redirectUrl); | ||
378 | } | 382 | } |
379 | 383 | ||
380 | /** | 384 | /** |
@@ -408,7 +412,11 @@ class EntryController extends Controller | |||
408 | ); | 412 | ); |
409 | 413 | ||
410 | // don't redirect user to the deleted entry | 414 | // don't redirect user to the deleted entry |
411 | return $this->redirect($url !== $request->headers->get('referer') ? $request->headers->get('referer') : $this->generateUrl('homepage')); | 415 | $to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null); |
416 | |||
417 | $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to); | ||
418 | |||
419 | return $this->redirect($redirectUrl); | ||
412 | } | 420 | } |
413 | 421 | ||
414 | /** | 422 | /** |
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index e8e9ecbe..16d14d79 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -65,7 +65,9 @@ class TagController extends Controller | |||
65 | } | 65 | } |
66 | $em->flush(); | 66 | $em->flush(); |
67 | 67 | ||
68 | return $this->redirect($request->headers->get('referer')); | 68 | $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer')); |
69 | |||
70 | return $this->redirect($redirectUrl); | ||
69 | } | 71 | } |
70 | 72 | ||
71 | /** | 73 | /** |