diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-24 13:22:39 -0700 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-24 13:22:39 -0700 |
| commit | 14300a147587755ecf07fae038a3767039fd8504 (patch) | |
| tree | 11caf0b3786e05c277db2c719becc9dbf8455a4f /phpBB/install | |
| parent | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff) | |
| parent | fdece6cdf3cb375da1ee4ab488d2ec8d854845db (diff) | |
| download | forums-14300a147587755ecf07fae038a3767039fd8504.tar forums-14300a147587755ecf07fae038a3767039fd8504.tar.gz forums-14300a147587755ecf07fae038a3767039fd8504.tar.bz2 forums-14300a147587755ecf07fae038a3767039fd8504.tar.xz forums-14300a147587755ecf07fae038a3767039fd8504.zip | |
Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 8016ff349b..5a2287c9e1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -174,6 +174,8 @@ define('IN_DB_UPDATE', true); // End startup code $migrator = $phpbb_container->get('migrator'); +$migrator->set_output_handler(new \phpbb\db\html_migrator_output_handler($user)); + $migrator->create_migrations_table(); $phpbb_extension_manager = $phpbb_container->get('ext.manager'); @@ -199,8 +201,6 @@ $safe_time_limit = min(15, ($phpbb_ini->get_int('max_execution_time') / 2)); while (!$migrator->finished()) { - $migration_start_time = microtime(true); - try { $migrator->update(); @@ -219,28 +219,6 @@ while (!$migrator->finished()) $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']); - } - else - { - if ($migrator->last_run_migration['task'] == 'process_data_step' && $state['migration_data_done']) - { - echo $user->lang('MIGRATION_DATA_DONE', $migrator->last_run_migration['name'], (microtime(true) - $migration_start_time)); - } - else if ($migrator->last_run_migration['task'] == 'process_data_step') - { - echo $user->lang('MIGRATION_DATA_IN_PROGRESS', $migrator->last_run_migration['name'], (microtime(true) - $migration_start_time)); - } - else if ($state['migration_schema_done']) - { - echo $user->lang('MIGRATION_SCHEMA_DONE', $migrator->last_run_migration['name'], (microtime(true) - $migration_start_time)); - } - } - - echo "<br />\n"; - // 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) { |