@@ -111,7 +111,7 @@ class ModelChoiceList extends ArrayChoiceList
{
parent::load();
- if ($this->choices) {
+ if (is_array($this->choices)) {
$entities = $this->choices;
} else if ($this->query) {
$entities = $this->modelManager->executeQuery($this->query);
@@ -45,7 +45,7 @@ class ModelType extends AbstractType
'class' => null,
'property' => null,
'query' => null,
- 'choices' => array(),
+ 'choices' => null,
'parent' => 'choice',
'preferred_choices' => array(),
'field_description' => false,