aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-30 12:27:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-30 12:27:14 +0200
commitf64a937a57d108cf7cf6343e8d439a5d035c4e53 (patch)
tree705eeb0aae33533536e71fb0fb90b348cfad5ae9
parent71ac6ab2b87ec1d606d5669b930ac4c7164e9b11 (diff)
downloadforums-f64a937a57d108cf7cf6343e8d439a5d035c4e53.tar
forums-f64a937a57d108cf7cf6343e8d439a5d035c4e53.tar.gz
forums-f64a937a57d108cf7cf6343e8d439a5d035c4e53.tar.bz2
forums-f64a937a57d108cf7cf6343e8d439a5d035c4e53.tar.xz
forums-f64a937a57d108cf7cf6343e8d439a5d035c4e53.zip
[ticket/13111] Dropdown options are already an array in the field data
PHPBB3-13111
-rw-r--r--phpBB/phpbb/profilefields/type/type_base.php2
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;