浏览代码

Merge pull request #4084 from core23/patch/bc-acl-matrix-type

Fix BC issue on AclMatrixType
Christian Gripp 8 年之前
父节点
当前提交
dd253e3a2d
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      Util/AdminObjectAclManipulator.php

+ 6 - 1
Util/AdminObjectAclManipulator.php

@@ -272,7 +272,12 @@ class AdminObjectAclManipulator
                 );
                 );
             }
             }
 
 
-            $formBuilder->add($key, new AclMatrixType(), array('permissions' => $permissions, 'acl_value' => $aclValue));
+            // NEXT_MAJOR: remove when dropping Symfony <2.8 support
+            $type = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ?
+                'Sonata\AdminBundle\Form\Type\AclMatrixType' :
+                new AclMatrixType();
+
+            $formBuilder->add($key, $type, array('permissions' => $permissions, 'acl_value' => $aclValue));
         }
         }
 
 
         return $formBuilder->getForm();
         return $formBuilder->getForm();