diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-28 20:24:51 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-03 14:20:28 +0100 |
| commit | 36460ebdf679f3cecb11afdc6e43e64195cc1d27 (patch) | |
| tree | 552a7dba965d88c08edede21a374424484d6c368 /phpBB/phpbb/install/module | |
| parent | 9525a64d6411cea7c72b140e8266678593148038 (diff) | |
| download | forums-36460ebdf679f3cecb11afdc6e43e64195cc1d27.tar forums-36460ebdf679f3cecb11afdc6e43e64195cc1d27.tar.gz forums-36460ebdf679f3cecb11afdc6e43e64195cc1d27.tar.bz2 forums-36460ebdf679f3cecb11afdc6e43e64195cc1d27.tar.xz forums-36460ebdf679f3cecb11afdc6e43e64195cc1d27.zip | |
[ticket/14492] Do not copy viglink on update if it was deleted
PHPBB3-14492
Diffstat (limited to 'phpBB/phpbb/install/module')
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/file_check.php | 9 |
1 files changed, 9 insertions, 0 deletions
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 f4b3870148..e4e0be0531 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php @@ -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; |