diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-04 14:51:00 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-04 14:51:00 -0500 |
| commit | e652c078e694082a6cec76cc998bea346e66f02b (patch) | |
| tree | 88539fff381b03669c8aa536a22798a2cebcded5 /phpBB/install/database_update.php | |
| parent | eb5075c80f9ddbec220e613a92ba37aa03a8a4f9 (diff) | |
| parent | 6cad032fbb2ceba892c861f8a2abab82574b12ae (diff) | |
| download | forums-e652c078e694082a6cec76cc998bea346e66f02b.tar forums-e652c078e694082a6cec76cc998bea346e66f02b.tar.gz forums-e652c078e694082a6cec76cc998bea346e66f02b.tar.bz2 forums-e652c078e694082a6cec76cc998bea346e66f02b.tar.xz forums-e652c078e694082a6cec76cc998bea346e66f02b.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11393' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11393:
[ticket/11393] Give more information on database updater
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4938ef0f87..6c8a95a413 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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) |