Fix bug when not enabling sonata

wouterj · wouterj · commit f040644648bb · 2015-12-16T11:58:08.000+01:00
diff --git a/DependencyInjection/CmfRoutingExtension.php b/DependencyInjection/CmfRoutingExtension.php
@@ -227,13 +227,13 @@ private function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuil
 
     private function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBuilder $container)
     {
-        $loader->load('admin-phpcr.xml');
-
         $bundles = $container->getParameter('kernel.bundles');
         if ('auto' === $config['use_sonata_admin'] && !isset($bundles['SonataDoctrinePHPCRAdminBundle'])) {
             return;
         }
 
+        $loader->load('admin-phpcr.xml');
+
         $basePath = $config['admin_basepath'] ?: reset($config['route_basepaths']);
         $container->setParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath', $basePath);
 

Original file line number	Diff line number	Diff line change
`@@ -227,13 +227,13 @@ private function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuil`
`227`	`227`
`228`	`228`	`private function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBuilder $container)`
`229`	`229`	`{`
`230`		`- $loader->load('admin-phpcr.xml');`
`231`		`-`
`232`	`230`	`$bundles = $container->getParameter('kernel.bundles');`
`233`	`231`	`if ('auto' === $config['use_sonata_admin'] && !isset($bundles['SonataDoctrinePHPCRAdminBundle'])) {`
`234`	`232`	`return;`
`235`	`233`	`}`
`236`	`234`
	`235`	`+ $loader->load('admin-phpcr.xml');`
	`236`	`+`
`237`	`237`	`$basePath = $config['admin_basepath'] ?: reset($config['route_basepaths']);`
`238`	`238`	`$container->setParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath', $basePath);`
`239`	`239`