diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-31 22:49:54 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-31 22:49:54 +0200 |
| commit | f9b60863025b02f49261515f952e99dd23f25bb6 (patch) | |
| tree | 7a96f07e6127133fc07f7eef455e0132fcef03c4 /phpBB/phpbb/install/module/update_database/task | |
| parent | 65113f222e6f0034b9c102aafa154bf1628a4912 (diff) | |
| parent | 9fc01a42e678a934507dede60b9e1e806ccfd787 (diff) | |
| download | forums-f9b60863025b02f49261515f952e99dd23f25bb6.tar forums-f9b60863025b02f49261515f952e99dd23f25bb6.tar.gz forums-f9b60863025b02f49261515f952e99dd23f25bb6.tar.bz2 forums-f9b60863025b02f49261515f952e99dd23f25bb6.tar.xz forums-f9b60863025b02f49261515f952e99dd23f25bb6.zip | |
Merge pull request #4255 from CHItA/ticket/14393
[ticket/14393] Fix updater behaviour
* CHItA/ticket/14393:
[ticket/14393] Fix db update progress bar
[ticket/14393] Fix init for conflict archive
[ticket/14393] Fix updater behaviour
Diffstat (limited to 'phpBB/phpbb/install/module/update_database/task')
| -rw-r--r-- | phpBB/phpbb/install/module/update_database/task/update.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/module/update_database/task/update.php b/phpBB/phpbb/install/module/update_database/task/update.php index 4b2baf2c23..9fed2317e9 100644 --- a/phpBB/phpbb/install/module/update_database/task/update.php +++ b/phpBB/phpbb/install/module/update_database/task/update.php @@ -142,6 +142,7 @@ class update extends task_base $this->migrator->set_migrations($migrations); $migration_count = count($this->migrator->get_migrations()); $this->iohandler->set_task_count($migration_count, true); + $this->installer_config->set_task_progress_count($migration_count); $progress_count = $this->installer_config->get('database_update_count', 0); while (!$this->migrator->finished()) @@ -183,8 +184,6 @@ class update extends task_base ); } - $this->iohandler->finish_progress('INLINE_UPDATE_SUCCESSFUL'); - $this->iohandler->add_success_message('INLINE_UPDATE_SUCCESSFUL'); $this->config->delete('version_update_from'); |