fixed 2.0 merge

This commit is contained in:
Fabien Potencier 2012-05-15 22:15:08 +02:00
parent 6b061bc8db
commit f27f5969b6

View File

@ -87,7 +87,7 @@ class PropertyPathMapper implements DataMapperInterface
{
$propertyPath = $form->getAttribute('property_path');
if (null !== $propertyPath && $form->isSynchronized() && !$form->isReadOnly()) {
if (null !== $propertyPath && $form->isSynchronized() && !$form->isDisabled()) {
// If the data is identical to the value in $data, we are
// dealing with a reference
$isReference = $form->getData() === $propertyPath->getValue($data);