aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/acp/acp_profile.php22
1 files changed, 19 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index ccd3dbf40d..82b14b2a3d 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -540,12 +540,17 @@ class acp_profile
{
$cp->vars[$key] = $$key;
}
- else if ($key == 'l_lang_options' && sizeof($cp->vars[$key]) > 1)
+ else if ($key == 'l_lang_options' && $field_type == FIELD_BOOL)
+ {
+ $cp->vars[$key] = request_var($key, array(0 => array('')), true);
+ }
+ else if ($key == 'l_lang_options' && is_array($cp->vars[$key]))
{
foreach ($cp->vars[$key] as $lang_id => $options)
{
$cp->vars[$key][$lang_id] = explode("\n", $options);
}
+
}
}
@@ -626,6 +631,11 @@ class acp_profile
$cp->vars['columns'] = request_var('columns', 0);
$_new_key_ary[$key] = $cp->vars['rows'] . '|' . $cp->vars['columns'];
}
+ if ($field_type == FIELD_BOOL && $key == 'l_lang_options' && isset($_REQUEST['l_lang_options']))
+ {
+ $_new_key_ary[$key] = request_var($key, array(array('')), true);
+
+ }
else
{
if (!isset($_REQUEST[$key]))
@@ -1080,8 +1090,14 @@ class acp_profile
$cp->vars['l_lang_name'] = request_var('l_lang_name', array(0 => ''), true);
$cp->vars['l_lang_explain'] = request_var('l_lang_explain', array(0 => ''), true);
$cp->vars['l_lang_default_value'] = request_var('l_lang_default_value', array(0 => ''), true);
- $cp->vars['l_lang_options'] = request_var('l_lang_options', array(0 => ''), true);
-
+ if ($field_type != FIELD_BOOL)
+ {
+ $cp->vars['l_lang_options'] = request_var('l_lang_options', array(0 => ''), true);
+ }
+ else
+ {
+ $cp->vars['l_lang_default_value'] = request_var('l_lang_default_value', array(0 => array('')), true);
+ }
if ($cp->vars['lang_options'])
{
if (!is_array($cp->vars['lang_options']))