diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-08 08:51:47 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-08 08:51:47 +0000 |
| commit | b3554f02c51cf5d6b60cf164a8c0b5ec9654295e (patch) | |
| tree | 8dc37aa9f7414f49990de231cb6a454d25d52a5d | |
| parent | eaa66690104c130eb15aef16a01a393611d257a8 (diff) | |
| download | forums-b3554f02c51cf5d6b60cf164a8c0b5ec9654295e.tar forums-b3554f02c51cf5d6b60cf164a8c0b5ec9654295e.tar.gz forums-b3554f02c51cf5d6b60cf164a8c0b5ec9654295e.tar.bz2 forums-b3554f02c51cf5d6b60cf164a8c0b5ec9654295e.tar.xz forums-b3554f02c51cf5d6b60cf164a8c0b5ec9654295e.zip | |
#12237
git-svn-id: file:///svn/phpbb/trunk@7727 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 19 |
2 files changed, 13 insertions, 7 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d98a5bf062..7d6f21fe5c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -245,6 +245,7 @@ p a { <li>[Fix] Make sure that a folder is used when viewing messages to oneself (Bug #12105)</li> <li>[Fix] Account for the fact that a board might have no visible Admins (Bug #12185)</li> <li>[Fix] Change group ranks even if empty (Bug #12231)</li> + <li>[Fix] Correctly propagate variables across the custom profile field wizard (Bug #12237)</li> <li>[Fix] Correctly move pm's into folders if more than one is received (Bug #12135)</li> </ul> diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 2d4091f2f9..cfe982d9ae 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -449,8 +449,7 @@ class acp_profile // Get the number of options if this key is 'field_maxlen' $var = sizeof(explode("\n", request_var('lang_options', '', true))); } - - if ($field_type == FIELD_TEXT && $key == 'field_length') + else if ($field_type == FIELD_TEXT && $key == 'field_length') { if (isset($_REQUEST['rows'])) { @@ -465,8 +464,7 @@ class acp_profile $cp->vars['columns'] = $row_col[1]; } } - - if ($field_type == FIELD_DATE && $key == 'field_default_value') + else if ($field_type == FIELD_DATE && $key == 'field_default_value') { $always_now = request_var('always_now', 0); @@ -622,13 +620,20 @@ class acp_profile foreach ($key_ary as $key) { - if (!isset($_REQUEST[$key])) + if (!isset($cp->vars[$key])) { - $var = false; + if (!isset($_REQUEST[$key])) + { + $var = false; + } + else + { + $_new_key_ary[$key] = (is_array($_REQUEST[$key])) ? request_var($key, array(''), true) : request_var($key, '', true); + } } else { - $_new_key_ary[$key] = (is_array($_REQUEST[$key])) ? request_var($key, array(''), true) : request_var($key, '', true); + $_new_key_ary[$key] = $cp->vars[$key]; } } |