diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-09 20:48:14 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-09 20:48:14 +0100 |
| commit | ddfc52a5f6d0835067a33ff187ce8313e6088f4e (patch) | |
| tree | 5e0f583cd977a4251c1f6c447e513122b364fa66 | |
| parent | 54751991ad1af8c60416fac5a58abfd5d9f30f93 (diff) | |
| parent | 37a3bd131bf82becc436c72a4e01975f4381d4f6 (diff) | |
| download | forums-ddfc52a5f6d0835067a33ff187ce8313e6088f4e.tar forums-ddfc52a5f6d0835067a33ff187ce8313e6088f4e.tar.gz forums-ddfc52a5f6d0835067a33ff187ce8313e6088f4e.tar.bz2 forums-ddfc52a5f6d0835067a33ff187ce8313e6088f4e.tar.xz forums-ddfc52a5f6d0835067a33ff187ce8313e6088f4e.zip | |
Merge pull request #4571 from marc1706/ticket/14894
[ticket/14894] Use correct config name for conflicts archive extension
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php | 2 |
1 files changed, 1 insertions, 1 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 7f18950cf6..cf1e4cf4ac 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 @@ -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); |