Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13111] Dropdown options are already an array in the field data
This commit is contained in:
Andreas Fischer 2014-09-30 21:04:25 +02:00
commit 7694623cd2

View file

@ -133,7 +133,7 @@ abstract class type_base implements type_interface
{ {
foreach ($field_data[$key] as $lang_id => $options) foreach ($field_data[$key] as $lang_id => $options)
{ {
$field_data[$key][$lang_id] = explode("\n", $options); $field_data[$key][$lang_id] = is_array($options) ? $options : explode("\n", $options);
} }
return $current_value; return $current_value;