mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-13 03:54:57 +01:00
Code Issues Releases Wiki Activity

Some changes due to #10980.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7603 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-05-16 11:24:27 +00:00
parent e0ca9946b9
commit 770dab2ca8
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/install/install_convert.php
View File

@ -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;
}

1
phpBB/language/en/install.php
View File

@ -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',