浏览代码

Merge pull request #404 from stof/sonata_user_fix

Changed the check for SonataUserBundle
Thomas 13 年之前
父节点
当前提交
c7ec444ad3
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      DependencyInjection/SonataAdminExtension.php

+ 3 - 2
DependencyInjection/SonataAdminExtension.php

@@ -37,11 +37,12 @@ class SonataAdminExtension extends Extension
      */
      */
     public function load(array $configs, ContainerBuilder $container)
     public function load(array $configs, ContainerBuilder $container)
     {
     {
-        if (class_exists('Sonata\UserBundle\SonataUserBundle')) {
+        $bundles = $container->getParameter('kernel.bundles');
+        if (isset($bundles['SonataUserBundle'])) {
             // integrate the SonataUserBundle / FOSUserBundle if the bundle exists
             // integrate the SonataUserBundle / FOSUserBundle if the bundle exists
             array_unshift($configs, array(
             array_unshift($configs, array(
                 'templates' => array(
                 'templates' => array(
-                    'user_block' => 'SonataUserBundle:Admin:Core/user_block.html.twig'
+                    'user_block' => 'SonataUserBundle:Admin/Core:user_block.html.twig'
                 )
                 )
             ));
             ));
         }
         }