diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-13 00:16:46 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-13 00:16:46 +0100 |
| commit | f0bdf02b32b65eb607507693b8c65dcf8defdb78 (patch) | |
| tree | bf9839cc985aeb4f84ec8a092a211c94829de826 | |
| parent | 9406f1fe11d243a525290de5c0c8ea1f7a8c6105 (diff) | |
| parent | 2f54ab0a24a6ee036ab8ba3edeef3d8891864be6 (diff) | |
| download | forums-f0bdf02b32b65eb607507693b8c65dcf8defdb78.tar forums-f0bdf02b32b65eb607507693b8c65dcf8defdb78.tar.gz forums-f0bdf02b32b65eb607507693b8c65dcf8defdb78.tar.bz2 forums-f0bdf02b32b65eb607507693b8c65dcf8defdb78.tar.xz forums-f0bdf02b32b65eb607507693b8c65dcf8defdb78.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_base.php | 14 | ||||
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_bool.php | 2 |
2 files changed, 14 insertions, 2 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); } } diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php index 0582722833..75934e3be7 100644 --- a/phpBB/phpbb/profilefields/type/type_bool.php +++ b/phpBB/phpbb/profilefields/type/type_bool.php @@ -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); |