makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14393] Fix updater behaviour

Browse source 
PHPBB3-14393
This commit is contained in:
Máté Bartus 2016-03-27 18:25:06 +02:00
parent 4db229ff6c
commit 3278ff03e7
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/install/module/update_database/task/update.php
View file

@ -183,7 +183,7 @@ class update extends task_base
); );
} }
$this->iohandler->finish_progress('INLINE_UPDATE_SUCCESSFUL'); $this->iohandler->set_progress('INLINE_UPDATE_SUCCESSFUL', $migration_count);
$this->iohandler->add_success_message('INLINE_UPDATE_SUCCESSFUL'); $this->iohandler->add_success_message('INLINE_UPDATE_SUCCESSFUL');

1
phpBB/phpbb/install/module/update_filesystem/task/file_check.php
View file

@ -166,6 +166,7 @@ class file_check extends task_base
} }
$this->installer_config->set('update_files', $file_update_info); $this->installer_config->set('update_files', $file_update_info);
$this->installer_config->set('update_info', array());
} }
/** /**

10
phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
View file

@ -140,10 +140,14 @@ class show_file_status extends task_base
} }
else else
{ {
$this->file_updater->close();
$conflict_archive_path = $this->installer_config->get('update_file_conflict_archive', null);
// Remove archive // Remove archive
$this->filesystem->remove( if ($conflict_archive_path !== null && $this->filesystem->exists($conflict_archive_path))
$this->installer_config->get('update_file_conflict_archive', null) {
); $this->filesystem->remove($conflict_archive_path);
}
$this->installer_config->set('update_file_conflict_archive', null); $this->installer_config->set('update_file_conflict_archive', null);
} }