mirror of https://github.com/wallabag/wallabag.git
fix bug on detect active theme
This commit is contained in:
parent
3123b3c0c8
commit
ce782c84b8
|
@ -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;
|
||||||
|
|
|
@ -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'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue