diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-03-27 20:10:45 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2016-03-27 20:10:45 +0200 |
| commit | c44a01fd9deba39b43bcaf6979483a5b82bf364e (patch) | |
| tree | 878fae47946d9daa71db98f19077e09a739810f8 | |
| parent | 3278ff03e7809dd0bb31771b3928e8676a09c572 (diff) | |
| download | forums-c44a01fd9deba39b43bcaf6979483a5b82bf364e.tar forums-c44a01fd9deba39b43bcaf6979483a5b82bf364e.tar.gz forums-c44a01fd9deba39b43bcaf6979483a5b82bf364e.tar.bz2 forums-c44a01fd9deba39b43bcaf6979483a5b82bf364e.tar.xz forums-c44a01fd9deba39b43bcaf6979483a5b82bf364e.zip | |
[ticket/14393] Fix init for conflict archive
PHPBB3-14393
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php index 329e6b9315..7f18950cf6 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php @@ -66,11 +66,7 @@ class show_file_status extends task_base $this->cache = $container->get('cache.driver'); // Initialize compression file updater - $compression_method = $this->installer_config->get('compression_method', ''); $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); } @@ -96,6 +92,10 @@ class show_file_status extends task_base // Create archive for 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) { $this->file_updater->create_new_file( @@ -111,9 +111,9 @@ class show_file_status extends task_base 'DOWNLOAD_CONFLICTS', 'DOWNLOAD_CONFLICTS_EXPLAIN' ); - } - $this->file_updater->close(); + $this->file_updater->close(); + } // Render update file statuses $file_update_info = $this->installer_config->get('update_files', array()); @@ -140,7 +140,6 @@ class show_file_status extends task_base } else { - $this->file_updater->close(); $conflict_archive_path = $this->installer_config->get('update_file_conflict_archive', null); // Remove archive |