Merge pull request #1468 from wallabag/v2-fix-detect-theme

fix bug on detect active theme

2 files changed, 10 insertions, 4 deletions

diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
index 679186c0..054a3752 100644
--- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -42,7 +42,13 @@ class DetectActiveTheme implements DeviceDetectionInterface
      */
     public function getType()
     {
-        $user = $this->securityContext->getToken()->getUser();
+        $token = $this->securityContext->getToken();
+
+        if (is_null($token)) {
+            return $this->defaultTheme;
+        }
+
+        $user = $token->getUser();
 
         if (!$user instanceof User) {
             return $this->defaultTheme;
diff --git a/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php b/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
index 4945e9a9..9af8fad8 100644
--- a/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
@@ -10,8 +10,8 @@ class WallabagExtensionTest extends \PHPUnit_Framework_TestCase
     {
         $extension = new WallabagExtension();
 
-        $this->assertEquals("lemonde.fr", $extension->removeWww('www.lemonde.fr'));
-        $this->assertEquals("lemonde.fr", $extension->removeWww('lemonde.fr'));
-        $this->assertEquals("gist.github.com", $extension->removeWww('gist.github.com'));
+        $this->assertEquals('lemonde.fr', $extension->removeWww('www.lemonde.fr'));
+        $this->assertEquals('lemonde.fr', $extension->removeWww('lemonde.fr'));
+        $this->assertEquals('gist.github.com', $extension->removeWww('gist.github.com'));
     }
 }