1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-25 18:13:28 +01:00

[ticket/14492] Do not copy viglink on update if it was deleted

PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-01-28 20:24:51 +01:00
parent 9525a64d64
commit 36460ebdf6
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -138,6 +138,15 @@ class file_check extends task_base
$progress_count++;
$this->iohandler->set_progress('UPDATE_CHECK_FILES', $progress_count);
// Do not copy viglink again if the previous version was packaged
// with it but it does not exist (e.g. deleted by admin)
if (strpos($file, $this->phpbb_root_path . 'ext/phpbb/viglink') !== false &&
$this->update_helper->phpbb_version_compare($update_info['version']['from'], '3.2.0', '>=') &&
!$this->filesystem->exists($this->phpbb_root_path . 'ext/phpbb/viglink'))
{
continue;
}
if (!$this->filesystem->exists($file))
{
$file_update_info['new'][] = $filename;