diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:04:25 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:04:25 +0200 |
| commit | 7694623cd2ea0d53aadbd87cd4c7bfa37369c7ff (patch) | |
| tree | f4985fb30dfcd141c66082c0e7e0d5e4f0425263 /phpBB/phpbb | |
| parent | be5638c11024a82c4b2bb2edd5356a01e1a6f726 (diff) | |
| parent | 8fb9f19aaef087040ffa779add028bacb497c0d1 (diff) | |
| download | forums-7694623cd2ea0d53aadbd87cd4c7bfa37369c7ff.tar forums-7694623cd2ea0d53aadbd87cd4c7bfa37369c7ff.tar.gz forums-7694623cd2ea0d53aadbd87cd4c7bfa37369c7ff.tar.bz2 forums-7694623cd2ea0d53aadbd87cd4c7bfa37369c7ff.tar.xz forums-7694623cd2ea0d53aadbd87cd4c7bfa37369c7ff.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13111] Dropdown options are already an array in the field data
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_base.php b/phpBB/phpbb/profilefields/type/type_base.php index c770a0d93c..52f5d15511 100644 --- a/phpBB/phpbb/profilefields/type/type_base.php +++ b/phpBB/phpbb/profilefields/type/type_base.php @@ -133,7 +133,7 @@ abstract class type_base implements type_interface { 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; |