makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Inserting lots of ugly to code to introduce CFPs to the new dimension-aware request_var. I hope I got all of the nasty critters spawned by it.

Browse source 
#11803


git-svn-id: file:///svn/phpbb/trunk@7730 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-06-08 15:12:03 +00:00
parent fb89a2d85e
commit 7a5bb1c074
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/includes/acp/acp_profile.php
View file

@ -540,12 +540,17 @@ class acp_profile
{ {
$cp->vars[$key] = $$key; $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) foreach ($cp->vars[$key] as $lang_id => $options)
{ {
$cp->vars[$key][$lang_id] = explode("\n", $options); $cp->vars[$key][$lang_id] = explode("\n", $options);
} }
} }
} }
@ -626,6 +631,11 @@ class acp_profile
$cp->vars['columns'] = request_var('columns', 0); $cp->vars['columns'] = request_var('columns', 0);
$_new_key_ary[$key] = $cp->vars['rows'] . '|' . $cp->vars['columns']; $_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 else
{ {
if (!isset($_REQUEST[$key])) 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_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_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_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 ($cp->vars['lang_options'])
{ {
if (!is_array($cp->vars['lang_options'])) if (!is_array($cp->vars['lang_options']))