fix bug on detect active theme

diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
index 679186c08415f3b9cd54c35edeafe1ea68ec5490..054a375227c0345c7712c660c2682e81161d050a 100644 (file)
--- 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 4945e9a95fcbf3b297a8abcef93a9c39a708e175..9af8fad8f26d544f2d8687f28b782f10bd51983b 100644 (file)
--- 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'));
     }
 }