[TwigBundle] fixed ifrole tag when security context is not enabled

symfony · Nov 26, 2010 · 07eceb7 · 07eceb7
1 parent 1e983a6
commit 07eceb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Symfony/Bundle/TwigBundle/Extension/SecurityExtension.php b/src/Symfony/Bundle/TwigBundle/Extension/SecurityExtension.php
@@ -27,9 +27,13 @@ public function __construct(SecurityContext $context = null)
         $this->context = $context;
     }
 
-    public function getContext()
+    public function vote($role, $object = null)
     {
-        return $this->context;
+        if (null === $this->context) {
+            return false;
+        }
+
+        return $this->context->vote($role, $object);
     }
 
     /**

diff --git a/src/Symfony/Bundle/TwigBundle/Node/IfRoleNode.php b/src/Symfony/Bundle/TwigBundle/Node/IfRoleNode.php
@@ -30,7 +30,7 @@ public function compile($compiler)
     {
         $compiler
             ->addDebugInfo($this)
-            ->write('if ($this->env->getExtension(\'security\')->getContext()->vote(')
+            ->write('if ($this->env->getExtension(\'security\')->vote(')
             ->subcompile($this->getNode('role'))
         ;