Преглед на файлове

[DoctrineMongoDBBundle] Moved loading of default configuration inside conditional so it's only loaded once.

Kris Wallsmith преди 15 години
родител
ревизия
c888bcdd59
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 2 3
      src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php

+ 2 - 3
src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php

@@ -38,10 +38,9 @@ class MongoDBExtension extends Extension
      */
     public function mongodbLoad($config, ContainerBuilder $container)
     {
-        $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
-        $loader->load($this->resources['mongodb']);
-
         if (!$container->hasDefinition('doctrine.odm.mongodb.document_manager')) {
+            $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
+            $loader->load($this->resources['mongodb']);
 
             $container->setParameter('doctrine.odm.mongodb.mapping_dirs', $this->findBundleSubpaths('Resources/config/doctrine/metadata', $container));
             $container->setParameter('doctrine.odm.mongodb.document_dirs', $this->findBundleSubpaths('Document', $container));