type subscriber - choice value fix

Padam87 · Apr 15, 2013 · e2e8a82 · e2e8a82
1 parent 78f3872
commit e2e8a82
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Form/EventListener/AttributeTypeSubscriber.php b/Form/EventListener/AttributeTypeSubscriber.php
@@ -78,10 +78,6 @@ public function createValueField($data, $form, $fieldName = 'value')
         }
 
         if ($type == 'choice' || $type == 'checkbox' || $type == 'radio') {
-            if (!is_array($value)) {
-                $value = array();
-            }
-
             if (($type == 'checkbox' || $type == 'radio') && $this->getOption('allow_expanded')) {
                 $params['expanded'] = true;
             }
@@ -92,6 +88,12 @@ public function createValueField($data, $form, $fieldName = 'value')
                 if ($type == 'radio') {
                     $params['multiple'] = false;
                 } elseif ($type == 'checkbox') {
+                    if (!is_array($value)) {
+                        $value = array(
+                            $value => $value
+                        );
+                    }
+
                     $params['multiple'] = true;
                 }
             }