diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/install_convert.php | 14 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 1 |
2 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 12d4eda5ec..91c96134d0 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -1553,13 +1553,23 @@ class install_convert extends module if ($final_jump == 1) { + $db->sql_return_on_error(true); update_topics_posted(); - $template->assign_block_vars('checks', array( 'TITLE' => $user->lang['UPDATE_TOPICS_POSTED'], 'RESULT' => $user->lang['DONE'], )); - + + if ($db->sql_error_triggered) + { + $template->assign_vars(array( + 'S_ERROR_BOX' => true, + 'ERROR_TITLE' => $user->lang['UPDATE_TOPICS_POSTED'], + 'ERROR_MSG' => $user->lang['UPDATE_TOPICS_POSTED_ERR'], + )); + } + $db->sql_return_on_error(false); + $this->finish_conversion(); return; } diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index ea5e31ab9f..98688fd957 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -343,6 +343,7 @@ $lang = array_merge($lang, array( 'UNAVAILABLE' => 'Unavailable', 'UNWRITABLE' => 'Unwritable', 'UPDATE_TOPICS_POSTED' => 'Generating topics posted information', + 'UPDATE_TOPICS_POSTED_ERR' => 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.', 'VERSION' => 'Version', 'WELCOME_INSTALL' => 'Welcome to phpBB3 Installation', |