Fabien Potencier 14 rokov pred
rodič
commit
59fd014503

+ 4 - 0
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SecurityHelper.php

@@ -35,6 +35,10 @@ class SecurityHelper extends Helper
 
     public function vote($role, $object = null)
     {
+        if (null === $this->context) {
+            return false;
+        }
+
         return $this->context->vote($role, $object);
     }
 

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php

@@ -117,7 +117,7 @@ class Translator extends BaseTranslator
         $this->writeCacheFile($this->getCacheFile($locale), sprintf(
             "<?php use Symfony\Component\Translation\MessageCatalogue; return new MessageCatalogue('%s', %s);",
             $locale,
-            var_export($this->catalogues[$locale]->getMessages(), true)
+            var_export($this->catalogues[$locale]->all(), true)
         ));
 
         if ($this->options['debug']) {