Merge pull request #2097 from bmillemathias/issue_2045

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Controller / EntryController.php

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 17b72bd1c56e632c8d5c4bc7bfdfd4a88f0064c0..69dfd4b108a12e305943a35d908acde9a1a60215 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -344,7 +344,9 @@ class EntryController extends Controller
             $message
         );
 
-        return $this->redirect($request->headers->get('referer'));
+        $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
+
+        return $this->redirect($redirectUrl);
     }
 
     /**
@@ -374,7 +376,9 @@ class EntryController extends Controller
             $message
         );
 
-        return $this->redirect($request->headers->get('referer'));
+        $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
+
+        return $this->redirect($redirectUrl);
     }
 
     /**
@@ -408,7 +412,11 @@ class EntryController extends Controller
         );
 
         // don't redirect user to the deleted entry
-        return $this->redirect($url !== $request->headers->get('referer') ? $request->headers->get('referer') : $this->generateUrl('homepage'));
+        $to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null);
+
+        $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);
+
+        return $this->redirect($redirectUrl);
     }
 
     /**