diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-11-30 23:17:00 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-12-02 12:16:32 +0100 |
| commit | e95414ed541647d4a42b9349d1bb939725b57b0b (patch) | |
| tree | 3aed98d5c84c9f1546c9d3dd678745533fbdbcc4 /phpBB/phpbb | |
| parent | 1316fe208482d0a56ce6e54b79a1a00ae05d32ce (diff) | |
| download | forums-e95414ed541647d4a42b9349d1bb939725b57b0b.tar forums-e95414ed541647d4a42b9349d1bb939725b57b0b.tar.gz forums-e95414ed541647d4a42b9349d1bb939725b57b0b.tar.bz2 forums-e95414ed541647d4a42b9349d1bb939725b57b0b.tar.xz forums-e95414ed541647d4a42b9349d1bb939725b57b0b.zip | |
[ticket/14326] Decode diffed file's content during update
PHPBB3-14326
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/update_files.php | 10 |
2 files changed, 6 insertions, 6 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 1c6b9aa058..e712b8ad6a 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 @@ -100,7 +100,7 @@ class show_file_status extends task_base { $this->file_updater->create_new_file( $filename, - $this->cache->get('_file_' . md5($filename)), + base64_decode($this->cache->get('_file_' . md5($filename))), true ); } diff --git a/phpBB/phpbb/install/module/update_filesystem/task/update_files.php b/phpBB/phpbb/install/module/update_filesystem/task/update_files.php index 747a86281b..fbb465cc66 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/update_files.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/update_files.php @@ -164,20 +164,20 @@ class update_files extends task_base { case 'delete': $this->file_updater->delete_file($path); - break; + break; case 'new': $this->file_updater->create_new_file($path, $new_path . $path); - break; + break; case 'update_without_diff': $this->file_updater->update_file($path, $new_path . $path); - break; + break; case 'update_with_diff': $this->file_updater->update_file( $path, - $this->cache->get('_file_' . md5($path)), + base64_decode($this->cache->get('_file_' . md5($path))), true ); - break; + break; } // Save progress |