1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 01:51:31 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2016-12-09 20:48:17 +01:00

View File

@@ -92,7 +92,7 @@ class show_file_status extends task_base
// Create archive for merge conflicts
if (!empty($merge_conflicts))
{
$compression_method = $this->installer_config->get('compression_method', '');
$compression_method = $this->installer_config->get('file_update_compression', '');
$conflict_archive = $this->file_updater->init($compression_method);
$this->installer_config->set('update_file_conflict_archive', $conflict_archive);