Merge branch 'antongorodezkiy-master'

zofe · May 31, 2016 · b4c0d49 · b4c0d49
2 parents bcec99b + 40481a0
commit b4c0d49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/DataForm/Field/Checkboxgroup.php b/src/DataForm/Field/Checkboxgroup.php
@@ -24,7 +24,12 @@ public function getValue()
     {
         parent::getValue();
 
-        $this->values = explode($this->serialization_sep, $this->value);
+        if (is_array($this->value)) {
+            $this->values = $this->value;
+        }
+        else {
+            $this->values = explode($this->serialization_sep, $this->value);
+        }
 
         $description_arr = array();
         foreach ($this->options as $value => $description) {

diff --git a/src/DataForm/Field/Multiselect.php b/src/DataForm/Field/Multiselect.php
@@ -20,7 +20,12 @@ public function getValue()
     {
         parent::getValue();
 
-        $this->values = explode($this->serialization_sep, $this->value);
+        if (is_array($this->value)) {
+            $this->values = $this->value;
+        }
+        else {
+            $this->values = explode($this->serialization_sep, $this->value);
+        }
 
         $description_arr = array();
         foreach ($this->options as $value => $description) {