1 files changed, 8 insertions, 1 deletions

diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
index 9f90ee3e..f1d5fdea 100644
--- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -16,15 +16,18 @@ class DetectActiveTheme implements DeviceDetectionInterface
 {
     protected $tokenStorage;
     protected $defaultTheme;
+    protected $themes;
 
     /**
      * @param TokenStorageInterface $tokenStorage Needed to retrieve the current user
      * @param string                $defaultTheme Default theme when user isn't logged in
+     * @param array $themes    Themes come from the LiipThemeBundle (liip_theme.themes)
      */
-    public function __construct(TokenStorageInterface $tokenStorage, $defaultTheme)
+    public function __construct(TokenStorageInterface $tokenStorage, $defaultTheme, $themes)
     {
         $this->tokenStorage = $tokenStorage;
         $this->defaultTheme = $defaultTheme;
+        $this->themes = $themes;
     }
 
     public function setUserAgent($userAgent)
@@ -60,6 +63,10 @@ class DetectActiveTheme implements DeviceDetectionInterface
             return $this->defaultTheme;
         }
 
+        if (!in_array($config->getTheme(), $this->themes)) {
+            return $this->defaultTheme;
+        }
+
         return $config->getTheme();
     }
 }