sonata-project/SonataUserBundle — pull request #94 by TomAdam (2012-06-06 10:07:00+00:00)
Title: Fix for BC issues in 2.1

Fixes for issues noted by @lopsided in #93 and #92. I have one question: why does the setDefaultOptions function set 'choices' and 'read_only_choices' to array() if the parent type has and default 'choices' set? I just don't really understand why this is done, but the attached code mirrors the functionality from the 2.0 branch, so this PR maintains the intended (and in my opinion, suspect) behaviour.