diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-04 14:31:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-04 14:31:07 +0000 |
| commit | 567b01302b735c03e596be1b1b7d01261084c62b (patch) | |
| tree | 6a491c15d527ce18e7697a1c0077b16584ddf75c /phpBB/includes | |
| parent | c6ef0181e30efa44640e75a483931e5e6e9b62a8 (diff) | |
| download | forums-567b01302b735c03e596be1b1b7d01261084c62b.tar forums-567b01302b735c03e596be1b1b7d01261084c62b.tar.gz forums-567b01302b735c03e596be1b1b7d01261084c62b.tar.bz2 forums-567b01302b735c03e596be1b1b7d01261084c62b.tar.xz forums-567b01302b735c03e596be1b1b7d01261084c62b.zip | |
- change conversion to process dotted topics after syncing (else some informations needed are wrong or do not exist at all). This also adds the ability to shift some operations to the very end after syncing.
- remember entered register data when changing the default language.
git-svn-id: file:///svn/phpbb/trunk@7118 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions_convert.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 20 |
3 files changed, 26 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 367b38fd25..d49f933008 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -249,7 +249,10 @@ class acp_main } unset($posted); - $db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary); + if (sizeof($sql_ary)) + { + $db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary); + } } add_log('admin', 'LOG_RESYNC_POST_MARKING'); diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index f8702fcc29..294390af69 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1934,7 +1934,10 @@ function update_topics_posted() } unset($posted); - $db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary); + if (sizeof($sql_ary)) + { + $db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary); + } } } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 7e017baafe..efae5a7bcf 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -67,6 +67,22 @@ class ucp_register $add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : ''; $add_coppa = ($coppa) ? '&coppa=1' : ''; + $s_hidden_fields = ($confirm_id) ? array('confirm_id' => $confirm_id) : array(); + + // If we change the language, we want to pass on some more possible parameter. + if ($change_lang) + { + // We do not include the password! + $s_hidden_fields = array_merge($s_hidden_fields, array( + 'username' => request_var('username', '', true), + 'email' => strtolower(request_var('email', '')), + 'email_confirm' => strtolower(request_var('email_confirm', '')), + 'confirm_code' => request_var('confirm_code', ''), + 'lang' => $user->lang_name, + 'tz' => request_var('tz', (float) $config['board_timezone']), + )); + } + if ($coppa === false && $config['coppa_enable']) { $now = getdate(); @@ -81,7 +97,7 @@ class ucp_register 'U_COPPA_YES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register&coppa=1' . $add_lang), 'S_SHOW_COPPA' => true, - 'S_HIDDEN_FIELDS' => ($confirm_id) ? '<input type="hidden" name="confirm_id" value="' . $confirm_id . '" />' : '', + 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang)) ); } @@ -92,7 +108,7 @@ class ucp_register 'S_SHOW_COPPA' => false, 'S_REGISTRATION' => true, - 'S_HIDDEN_FIELDS' => ($confirm_id) ? '<input type="hidden" name="confirm_id" value="' . $confirm_id . '" />' : '', + 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang . $add_coppa)) ); } |