Переглянути джерело

fixed security engine loading

Lukas Kahwe Smith 14 роки тому
батько
коміт
d10f631c3d

+ 2 - 0
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -58,6 +58,8 @@ class SecurityExtension extends Extension
         if (!$container->hasDefinition('security.context')) {
             $loader = new XmlFileLoader($container, array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config'));
             $loader->load('security.xml');
+            $loader->load('templating_php.xml');
+            $loader->load('templating_twig.xml');
         }
 
         if (isset($config['access-denied-url'])) {

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="templating.helper.security.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\SecurityHelper</parameter>
+        <parameter key="templating.helper.security.class">Symfony\Bundle\SecurityBundle\Templating\Helper\SecurityHelper</parameter>
     </parameters>
 
     <services>

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="twig.extension.security" class="Symfony\Bundle\TwigBundle\Extension\SecurityExtension" public="false">
+        <service id="twig.extension.security" class="Symfony\Bundle\SecurityBundle\Twig\Extension\SecurityExtension" public="false">
             <tag name="twig.extension" />
             <argument type="service" id="security.context" on-invalid="ignore" />
         </service>