diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-23 13:50:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-23 13:50:27 +0000 |
| commit | e855a348e3bb762ed2afd01343123980c26e6d46 (patch) | |
| tree | 321611ff71907583894a8605718ac7336ba4ff1b /phpBB/install/install_convert.php | |
| parent | 85a4e318819d4322684e8ee17d030064e8987a6b (diff) | |
| download | forums-e855a348e3bb762ed2afd01343123980c26e6d46.tar forums-e855a348e3bb762ed2afd01343123980c26e6d46.tar.gz forums-e855a348e3bb762ed2afd01343123980c26e6d46.tar.bz2 forums-e855a348e3bb762ed2afd01343123980c26e6d46.tar.xz forums-e855a348e3bb762ed2afd01343123980c26e6d46.zip | |
- fixed some convertor bugs
- adjusted forum standard access (+polls) role to include f_delete (no update, only new installations will have the change included)
git-svn-id: file:///svn/phpbb/trunk@7040 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_convert.php')
| -rw-r--r-- | phpBB/install/install_convert.php | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 54b8ee3a3d..49ce3689bd 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -141,7 +141,6 @@ class install_convert extends module } $db->sql_freeresult($result); - // Detect if there is already a conversion in progress at this point and offer to resume // It's quite possible that the user will get disconnected during a large conversion so they need to be able to resume it $new_conversion = request_var('new_conv', 0); @@ -168,13 +167,13 @@ class install_convert extends module // This information should have already been checked once, but do it again for safety if (!empty($options) && !empty($options['tag']) && - isset($convert->options['dbms']) && - isset($convert->options['dbhost']) && - isset($convert->options['dbport']) && - isset($convert->options['dbuser']) && - isset($convert->options['dbpasswd']) && - isset($convert->options['dbname']) && - isset($convert->options['table_prefix'])) + isset($options['dbms']) && + isset($options['dbhost']) && + isset($options['dbport']) && + isset($options['dbuser']) && + isset($options['dbpasswd']) && + isset($options['dbname']) && + isset($options['table_prefix'])) { $this->page_title = $lang['CONTINUE_CONVERT']; @@ -943,7 +942,12 @@ class install_convert extends module 'dbpasswd' => $convert->src_dbpasswd, )), true); - $msg = $user->lang['PRE_CONVERT_COMPLETE'] . '</p><p>' . sprintf($user->lang['AUTHOR_NOTES'], $convert->convertor_data['author_notes']); + $msg = $user->lang['PRE_CONVERT_COMPLETE']; + + if ($convert->convertor_data['author_notes']) + { + $msg .= '</p><p>' . sprintf($user->lang['AUTHOR_NOTES'], $convert->convertor_data['author_notes']); + } $url = $this->p_master->module_url . "?mode=$mode&sub=in_progress&tag={$convert->convertor_tag}$step"; $template->assign_vars(array( |