mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-07 07:58:48 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
fix bug on detect active theme
This commit is contained in:
Nicolas Lœuillet 2015-10-06 20:57:54 +02:00
commit 3bfbd22f13
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
View file

@ -42,7 +42,13 @@ class DetectActiveTheme implements DeviceDetectionInterface
*/ */
public function getType() 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) { if (!$user instanceof User) {
return $this->defaultTheme; return $this->defaultTheme;

6
src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
View file

@ -10,8 +10,8 @@ class WallabagExtensionTest extends \PHPUnit_Framework_TestCase
{ {
$extension = new WallabagExtension(); $extension = new WallabagExtension();
$this->assertEquals("lemonde.fr", $extension->removeWww('www.lemonde.fr')); $this->assertEquals('lemonde.fr', $extension->removeWww('www.lemonde.fr'));
$this->assertEquals("lemonde.fr", $extension->removeWww('lemonde.fr')); $this->assertEquals('lemonde.fr', $extension->removeWww('lemonde.fr'));
$this->assertEquals("gist.github.com", $extension->removeWww('gist.github.com')); $this->assertEquals('gist.github.com', $extension->removeWww('gist.github.com'));
} }
} }