diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-03 09:02:15 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-03 09:02:15 +0100 |
| commit | 5d0e8eaf09cdf310e45fc16b147ec14ddb48baf5 (patch) | |
| tree | 046c6b1eaa80d62a0425bd0b4b7dbf2fbbb13f84 /phpBB/phpbb/install | |
| parent | c2dddf296de3dc5ab106d8f3acc4c253def883a7 (diff) | |
| parent | e95414ed541647d4a42b9349d1bb939725b57b0b (diff) | |
| download | forums-5d0e8eaf09cdf310e45fc16b147ec14ddb48baf5.tar forums-5d0e8eaf09cdf310e45fc16b147ec14ddb48baf5.tar.gz forums-5d0e8eaf09cdf310e45fc16b147ec14ddb48baf5.tar.bz2 forums-5d0e8eaf09cdf310e45fc16b147ec14ddb48baf5.tar.xz forums-5d0e8eaf09cdf310e45fc16b147ec14ddb48baf5.zip | |
Merge pull request #4055 from CHItA/ticket/14326
[ticket/14326] Decode diffed file's content during update
Diffstat (limited to 'phpBB/phpbb/install')
| -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 |