diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/Redirect.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/Redirect.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/Redirect.php b/src/Wallabag/CoreBundle/Helper/Redirect.php index 0921c3f9..c14c79d1 100644 --- a/src/Wallabag/CoreBundle/Helper/Redirect.php +++ b/src/Wallabag/CoreBundle/Helper/Redirect.php | |||
@@ -4,6 +4,9 @@ namespace Wallabag\CoreBundle\Helper; | |||
4 | 4 | ||
5 | use Symfony\Component\Routing\Router; | 5 | use Symfony\Component\Routing\Router; |
6 | 6 | ||
7 | /** | ||
8 | * Manage redirections to avoid redirecting to empty routes. | ||
9 | */ | ||
7 | class Redirect | 10 | class Redirect |
8 | { | 11 | { |
9 | private $router; | 12 | private $router; |
@@ -21,16 +24,14 @@ class Redirect | |||
21 | */ | 24 | */ |
22 | public function to($url, $fallback = '') | 25 | public function to($url, $fallback = '') |
23 | { | 26 | { |
24 | $returnUrl = $url; | 27 | if (null !== $url) { |
28 | return $url; | ||
29 | } | ||
25 | 30 | ||
26 | if (null === $url) { | 31 | if ('' === $fallback) { |
27 | if ('' !== $fallback) { | 32 | return $this->router->generate('homepage'); |
28 | $returnUrl = $fallback; | ||
29 | } else { | ||
30 | $returnUrl = $this->router->generate('homepage'); | ||
31 | } | ||
32 | } | 33 | } |
33 | 34 | ||
34 | return $returnUrl; | 35 | return $fallback; |
35 | } | 36 | } |
36 | } | 37 | } |