mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11393' into develop

Browse Source 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11393:
  [ticket/11393] Give more information on database updater
This commit is contained in:
David King
2013-03-04 14:51:00 -05:00
parent eb5075c80f 6cad032fbb
commit e652c078e6
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/install/database_update.php
View File

@@ -228,7 +228,28 @@ while (!$migrator->finished())
phpbb_end_update($cache);
}
echo $migrator->last_run_migration['name'] . '<br />';
$state = array_merge(array(
'migration_schema_done' => false,
'migration_data_done' => false,
),
$migrator->last_run_migration['state']
);
if (isset($migrator->last_run_migration['effectively_installed']) && $migrator->last_run_migration['effectively_installed'])
{
echo $user->lang('MIGRATION_EFFECTIVELY_INSTALLED', $migrator->last_run_migration['name']) . '<br />';
}
else
{
if ($state['migration_data_done'])
{
echo $user->lang('MIGRATION_DATA_DONE', $migrator->last_run_migration['name']) . '<br />';
}
else if ($state['migration_schema_done'])
{
echo $user->lang('MIGRATION_SCHEMA_DONE', $migrator->last_run_migration['name']) . '<br />';
}
}
// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
if ((time() - $update_start_time) >= $safe_time_limit)