mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 08:35:31 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4055 from CHItA/ticket/14326

Browse Source 
[ticket/14326] Decode diffed file's content during update
This commit is contained in:
Marc Alexander 2015-12-03 09:02:15 +01:00
commit 5d0e8eaf09
2 changed files with 6 additions and 6 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

@ -100,7 +100,7 @@ class show_file_status extends task_base
{ {
$this->file_updater->create_new_file( $this->file_updater->create_new_file(
$filename, $filename,
$this->cache->get('_file_' . md5($filename)), base64_decode($this->cache->get('_file_' . md5($filename))),
true true
); );
} }

10
phpBB/phpbb/install/module/update_filesystem/task/update_files.php
View File

@ -164,20 +164,20 @@ class update_files extends task_base
{ {
case 'delete': case 'delete':
$this->file_updater->delete_file($path); $this->file_updater->delete_file($path);
break; break;
case 'new': case 'new':
$this->file_updater->create_new_file($path, $new_path . $path); $this->file_updater->create_new_file($path, $new_path . $path);
break; break;
case 'update_without_diff': case 'update_without_diff':
$this->file_updater->update_file($path, $new_path . $path); $this->file_updater->update_file($path, $new_path . $path);
break; break;
case 'update_with_diff': case 'update_with_diff':
$this->file_updater->update_file( $this->file_updater->update_file(
$path, $path,
$this->cache->get('_file_' . md5($path)), base64_decode($this->cache->get('_file_' . md5($path))),
true true
); );
break; break;
} }
// Save progress // Save progress