[FrameworkBundle] changed configuration to always include the session…

… service
symfony · Nov 12, 2010 · 8b9e979 · 8b9e979
1 parent 69cd21d
commit 8b9e979
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -111,9 +111,7 @@ public function configLoad($config, ContainerBuilder $container)
             $this->registerTestConfiguration($config, $container);
         }
 
-        if (isset($config['session'])) {
-            $this->registerSessionConfiguration($config, $container);
-        }
+        $this->registerSessionConfiguration($config, $container);
 
         $this->registerTranslatorConfiguration($config, $container);
 
@@ -305,13 +303,13 @@ protected function registerTranslatorConfiguration($config, ContainerBuilder $co
      */
     protected function registerSessionConfiguration($config, ContainerBuilder $container)
     {
-        $config = $config['session'];
-
         if (!$container->hasDefinition('session')) {
             $loader = new XmlFileLoader($container, array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config'));
             $loader->load('session.xml');
         }
 
+        $config = isset($config['session']) ? $config['session'] : array();
+
         foreach (array('default_locale', 'default-locale') as $key) {
             if (isset($config[$key])) {
                 $container->setParameter('session.default_locale', $config[$key]);