diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 23:11:20 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 23:11:20 +0200 |
| commit | 2f8ef80d92457e29f688155cd5433a92fa981139 (patch) | |
| tree | 4a0e2448a1a5700dabf17ace731f2a5d0aa7963c /phpBB | |
| parent | 4b447c71de8af0530574958e4c788186b606346f (diff) | |
| download | forums-2f8ef80d92457e29f688155cd5433a92fa981139.tar forums-2f8ef80d92457e29f688155cd5433a92fa981139.tar.gz forums-2f8ef80d92457e29f688155cd5433a92fa981139.tar.bz2 forums-2f8ef80d92457e29f688155cd5433a92fa981139.tar.xz forums-2f8ef80d92457e29f688155cd5433a92fa981139.zip | |
[ticket/14039] Fix folder creation and deleted binary file issue
PHPBB3-14039
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/install/helper/file_updater/file_updater.php | 7 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/file_check.php | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/helper/file_updater/file_updater.php b/phpBB/phpbb/install/helper/file_updater/file_updater.php index 00cb0d17bd..cc0f5c6b5f 100644 --- a/phpBB/phpbb/install/helper/file_updater/file_updater.php +++ b/phpBB/phpbb/install/helper/file_updater/file_updater.php @@ -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; $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)) { // Extract last 9 bits we actually need diff --git a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php index 4d9f736b0a..5dbee6c259 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php @@ -101,7 +101,7 @@ class file_check extends task_base $update_info = $this->installer_config->get('update_info_unprocessed', 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 $file_update_info['delete'] = array_filter( |