Use / as fallback when there is no route given

liip · Jun 13, 2018 · 92ba4e6 · lsmith77 · Jun 13, 2018 · 92ba4e6
1 parent e961202
commit 92ba4e6
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Controller/ThemeController.php b/Controller/ThemeController.php
@@ -47,7 +47,7 @@ class ThemeController
     protected $router;
 
     /**
-     * @var string
+     * @var string|null
      */
     protected $defaultRoute;
 
@@ -58,9 +58,9 @@ class ThemeController
      * @param array       $themes        Available themes
      * @param array|null  $cookieOptions The options of the cookie we look for the theme to set
      * @param RouterInterface $router
-     * @param string $defaultRoute
+     * @param string|null $defaultRoute
      */
-    public function __construct(ActiveTheme $activeTheme, array $themes, array $cookieOptions = null, RouterInterface $router, $defaultRoute = '/')
+    public function __construct(ActiveTheme $activeTheme, array $themes, array $cookieOptions = null, RouterInterface $router, $defaultRoute = null)
     {
         $this->activeTheme = $activeTheme;
         $this->themes = $themes;
@@ -88,7 +88,13 @@ public function switchAction(Request $request)
 
         $this->activeTheme->setName($theme);
 
-        $url = $request->headers->get('Referer', $this->router->generate($this->defaultRoute));
+        if ($defaultRoute) {
+          $url = $request->headers->get('Referer', $this->router->generate($this->defaultRoute));
+        }
+        else {
+          $url = $request->headers->get('Referer', '/');
+        }
+
         $response = new RedirectResponse($url);
 
         if (!empty($this->cookieOptions)) {