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

[ticket/14393] Fix init for conflict archive

Browse source 
PHPBB3-14393
This commit is contained in:
Máté Bartus 2016-03-27 20:10:45 +02:00
parent 3278ff03e7
commit c44a01fd9d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,11 +66,7 @@ class show_file_status extends task_base
$this->cache = $container->get('cache.driver'); $this->cache = $container->get('cache.driver');
// Initialize compression file updater // Initialize compression file updater
$compression_method = $this->installer_config->get('compression_method', '');
$this->file_updater = $file_updater_factory->get('compression'); $this->file_updater = $file_updater_factory->get('compression');
$conflict_archive = $this->file_updater->init($compression_method);
$this->installer_config->set('update_file_conflict_archive', $conflict_archive);
parent::__construct(false); parent::__construct(false);
} }
@ -96,6 +92,10 @@ class show_file_status extends task_base
// Create archive for merge conflicts // Create archive for merge conflicts
if (!empty($merge_conflicts)) if (!empty($merge_conflicts))
{ {
$compression_method = $this->installer_config->get('compression_method', '');
$conflict_archive = $this->file_updater->init($compression_method);
$this->installer_config->set('update_file_conflict_archive', $conflict_archive);
foreach ($merge_conflicts as $filename) foreach ($merge_conflicts as $filename)
{ {
$this->file_updater->create_new_file( $this->file_updater->create_new_file(
@ -111,9 +111,9 @@ class show_file_status extends task_base
'DOWNLOAD_CONFLICTS', 'DOWNLOAD_CONFLICTS',
'DOWNLOAD_CONFLICTS_EXPLAIN' 'DOWNLOAD_CONFLICTS_EXPLAIN'
); );
}
$this->file_updater->close(); $this->file_updater->close();
}
// Render update file statuses // Render update file statuses
$file_update_info = $this->installer_config->get('update_files', array()); $file_update_info = $this->installer_config->get('update_files', array());
@ -140,7 +140,6 @@ 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); $conflict_archive_path = $this->installer_config->get('update_file_conflict_archive', null);
// Remove archive // Remove archive