mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 09:00:48 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4571 from marc1706/ticket/14894

Browse Source 
[ticket/14894] Use correct config name for conflicts archive extension
This commit is contained in:
Marc Alexander 2016-12-09 20:48:14 +01:00
commit ddfc52a5f6
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
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);