[FrameworkBundle] fixed ESI configuration

symfony · Jan 23, 2011 · 86b357d · 86b357d
1 parent a868561
commit 86b357d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -290,9 +290,11 @@ protected function registerTestConfiguration(array $config, ContainerBuilder $co
      */
     protected function registerEsiConfiguration(array $config, ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('esi')) {
-            $loader = new XmlFileLoader($container, array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config'));
-            $loader->load('esi.xml');
+        if (isset($config['esi']['enabled']) && $config['esi']['enabled']) {
+            if (!$container->hasDefinition('esi')) {
+                $loader = new XmlFileLoader($container, array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config'));
+                $loader->load('esi.xml');
+            }
         }
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -17,6 +17,7 @@
             <xsd:element name="translator" type="translator" minOccurs="0" maxOccurs="1" />
             <xsd:element name="param-converter" type="param-converter" minOccurs="0" maxOccurs="1" />
             <xsd:element name="csrf-protection" type="csrf_protection" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="esi" type="esi" minOccurs="0" maxOccurs="1" />
         </xsd:all>
 
         <xsd:attribute name="ide" type="xsd:string" />
@@ -84,4 +85,8 @@
         <xsd:attribute name="field-name" type="xsd:string" />
         <xsd:attribute name="secret" type="xsd:string" />
     </xsd:complexType>
-</xsd:schema>
+
+    <xsd:complexType name="esi">
+        <xsd:attribute name="enabled" type="xsd:boolean" />
+    </xsd:complexType>
+</xsd:schema>