diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[TwigBundle] fall back to security instead of tokenStorage when not available

Browse Source
This commit is contained in:
Fabien Potencier 2015-01-13 07:56:56 +01:00
parent c7ae71d6da
commit b529830d6f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bundle/TwigBundle/AppVariable.php
View File

@ -86,11 +86,15 @@ class AppVariable
*/ */
public function getUser() public function getUser()
{ {
if (null === $this->tokenStorage) { if (null !== $this->tokenStorage) {
$tokenStorage = $this->tokenStorage;
} elseif (null !== $this->security) {
$tokenStorage = $this->security;
} else {
throw new \RuntimeException('The "app.user" variable is not available.'); throw new \RuntimeException('The "app.user" variable is not available.');
} }
if (!$token = $this->tokenStorage->getToken()) { if (!$token = $tokenStorage->getToken()) {
return; return;
} }