From 55c1efd14456b93b16c85a03e9b30e0cb9c776b9 Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bernhard.schussek@symfony-project.com>
Date: Wed, 30 Jun 2010 23:03:43 +0200
Subject: [PATCH] [FoundationBundle] Fixed the configuration of the annotation
 driver for the validator

---
 .../FoundationBundle/DependencyInjection/WebExtension.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php b/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
index 4b5061a6d7..ad9f8deba4 100644
--- a/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
+++ b/src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
@@ -92,8 +92,8 @@ class WebExtension extends LoaderExtension
             }
         }
 
-        if (isset($config['validation'])) {
-            if ($config['validation']) {
+        if (isset($config['validation']['enabled'])) {
+            if ($config['validation']['enabled']) {
                 if (!$configuration->hasDefinition('validator')) {
                     $loader = new XmlFileLoader(__DIR__.'/../Resources/config');
                     $configuration->merge($loader->load($this->resources['validation']));
@@ -160,7 +160,7 @@ class WebExtension extends LoaderExtension
 
                     $loader = $configuration->getDefinition('validator.mapping.loader.loader_chain');
                     $arguments = $loader->getArguments();
-                    array_unshift($arguments, new Reference('validator.mapping.loader.annotation_loader'));
+                    array_unshift($arguments[0], new Reference('validator.mapping.loader.annotation_loader'));
                     $loader->setArguments($arguments);
                 }
             } elseif ($configuration->hasDefinition('validator')) {