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

Merge pull request #3137 from prototech/ticket/13209

Browse source 
[ticket/13209] Fix loss of CPF language field values when switching steps
This commit is contained in:
Marc Alexander 2014-11-13 00:14:54 +01:00
commit 2f54ab0a24
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/phpbb/profilefields/type/type_base.php
View file

@ -158,7 +158,19 @@ abstract class type_base implements type_interface
} }
else 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);
} }
} }

2
phpBB/phpbb/profilefields/type/type_bool.php
View file

@ -352,7 +352,7 @@ class type_bool extends type_base
} }
} }
if ($step == 3 && ($field_data[$key] || $action != 'edit') && $key == 'l_lang_options') if ($key == 'l_lang_options' && $this->request->is_set($key))
{ {
$field_data[$key] = $this->request->variable($key, array(0 => array('')), true); $field_data[$key] = $this->request->variable($key, array(0 => array('')), true);