merged branch bschussek/optionfix (PR #4830)
Commits
-------
c6cb8b2
[Form] Removed unused option "inline" that was introduced by accident
Discussion
----------
[Form] Removed unused option "inline" that was introduced by accident
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
This commit is contained in:
commit
98e10c6175
@ -178,11 +178,6 @@ class FormType extends AbstractType
|
|||||||
return false !== $options['property_path'];
|
return false !== $options['property_path'];
|
||||||
};
|
};
|
||||||
|
|
||||||
// Compound forms are not displayed inline
|
|
||||||
$inline = function (Options $options) {
|
|
||||||
return !$options['compound'];
|
|
||||||
};
|
|
||||||
|
|
||||||
$resolver->setDefaults(array(
|
$resolver->setDefaults(array(
|
||||||
'data_class' => $dataClass,
|
'data_class' => $dataClass,
|
||||||
'empty_data' => $emptyData,
|
'empty_data' => $emptyData,
|
||||||
@ -202,7 +197,6 @@ class FormType extends AbstractType
|
|||||||
'virtual' => false,
|
'virtual' => false,
|
||||||
'compound' => true,
|
'compound' => true,
|
||||||
'translation_domain' => null,
|
'translation_domain' => null,
|
||||||
'inline' => $inline,
|
|
||||||
));
|
));
|
||||||
|
|
||||||
// If data is given, the form is locked to that data
|
// If data is given, the form is locked to that data
|
||||||
|
Reference in New Issue
Block a user