diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-05-16 11:24:27 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-05-16 11:24:27 +0000 |
| commit | 770dab2ca86928de371d27401a9faf6c31554316 (patch) | |
| tree | 58ba48117c2213d9ddd65153e6152bef850d2534 /phpBB/install/install_convert.php | |
| parent | e0ca9946b9e107251ee556b5f604f90eb6c2eb85 (diff) | |
| download | forums-770dab2ca86928de371d27401a9faf6c31554316.tar forums-770dab2ca86928de371d27401a9faf6c31554316.tar.gz forums-770dab2ca86928de371d27401a9faf6c31554316.tar.bz2 forums-770dab2ca86928de371d27401a9faf6c31554316.tar.xz forums-770dab2ca86928de371d27401a9faf6c31554316.zip | |
Some changes due to #10980.
git-svn-id: file:///svn/phpbb/trunk@7603 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_convert.php')
| -rw-r--r-- | phpBB/install/install_convert.php | 14 |
1 files changed, 12 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; } |