aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-11-11 16:28:06 -0800
committerCesar G <prototech91@gmail.com>2014-11-11 16:28:06 -0800
commit3108d0b0608d12e8f1e2e10dfa8d802ad86eb908 (patch)
tree96b4ab081bb96d299f92d141183427509cfd8398
parent101945acf98b7fb765a90288bc7dd403ee610dd5 (diff)
downloadforums-3108d0b0608d12e8f1e2e10dfa8d802ad86eb908.tar
forums-3108d0b0608d12e8f1e2e10dfa8d802ad86eb908.tar.gz
forums-3108d0b0608d12e8f1e2e10dfa8d802ad86eb908.tar.bz2
forums-3108d0b0608d12e8f1e2e10dfa8d802ad86eb908.tar.xz
forums-3108d0b0608d12e8f1e2e10dfa8d802ad86eb908.zip
[ticket/13209] Fix expected request value of CPF language fields.
Multiple languages can be edited, thus the expected value is an array. PHPBB3-13209
-rw-r--r--phpBB/phpbb/profilefields/type/type_base.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_base.php b/phpBB/phpbb/profilefields/type/type_base.php
index 52f5d15511..9b4bada26d 100644
--- a/phpBB/phpbb/profilefields/type/type_base.php
+++ b/phpBB/phpbb/profilefields/type/type_base.php
@@ -158,7 +158,19 @@ abstract class type_base implements type_interface
}
else
{
- return $this->request->variable($key, '', true);
+ $default_value = '';
+ $lang_fields = array(
+ 'l_lang_name',
+ 'l_lang_explain',
+ 'l_lang_default_value',
+ 'l_lang_options',
+ );
+
+ if (in_array($key, $lang_fields))
+ {
+ $default_value = array(0 => '');
+ }
+ return $this->request->variable($key, $default_value, true);
}
}