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

[ticket/14039] Fix folder creation and deleted binary file issue

Browse source 
PHPBB3-14039
This commit is contained in:
Mate Bartus 2015-10-18 23:11:20 +02:00
parent 4b447c71de
commit 2f8ef80d92
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/install/helper/file_updater/file_updater.php
View file

@ -113,6 +113,13 @@ class file_updater implements file_updater_interface
$path_to_file_to_update = $this->phpbb_root_path . $path_to_file_to_update; $path_to_file_to_update = $this->phpbb_root_path . $path_to_file_to_update;
$original_file_perms = false; $original_file_perms = false;
// Maybe necessary for binary files
$dir = dirname($path_to_file_to_update);
if (!$this->filesystem->exists($dir))
{
$this->make_dir($dir);
}
if (!$this->filesystem->is_writable($path_to_file_to_update)) if (!$this->filesystem->is_writable($path_to_file_to_update))
{ {
// Extract last 9 bits we actually need // Extract last 9 bits we actually need

2
phpBB/phpbb/install/module/update_filesystem/task/file_check.php
View file

@ -101,7 +101,7 @@ class file_check extends task_base
$update_info = $this->installer_config->get('update_info_unprocessed', array()); $update_info = $this->installer_config->get('update_info_unprocessed', array());
$file_update_info = array(); $file_update_info = array();
$file_update_info['update_without_diff'] = $update_info['binary']; $file_update_info['update_without_diff'] = array_diff($update_info['binary'], $update_info['deleted']);
// Filter out files that are already deleted // Filter out files that are already deleted
$file_update_info['delete'] = array_filter( $file_update_info['delete'] = array_filter(