makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14492] Use same list for checking if extension should be updated

Browse source 
PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-03-04 00:24:04 +01:00
parent 4f0627de03
commit edfc4f3efc
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/install/module/update_database/task/update_extensions.php
View file

@ -74,7 +74,7 @@ class update_extensions extends task_base
* @var array List of default extensions to update, grouped by version * @var array List of default extensions to update, grouped by version
* they were added * they were added
*/ */
private $default_update = [ static public $default_extensions_update = [
'3.2.0-b3' => ['phpbb/viglink'] '3.2.0-b3' => ['phpbb/viglink']
]; ];
@ -135,7 +135,7 @@ class update_extensions extends task_base
// Create list of default extensions that need to be enabled in update // Create list of default extensions that need to be enabled in update
$default_update_extensions = []; $default_update_extensions = [];
foreach ($this->default_update as $version => $extensions) foreach (self::$default_extensions_update as $version => $extensions)
{ {
if ($this->update_helper->phpbb_version_compare($version_from, $version, '<=')) if ($this->update_helper->phpbb_version_compare($version_from, $version, '<='))
{ {

35
phpBB/phpbb/install/module/update_filesystem/task/file_check.php
View file

@ -118,6 +118,17 @@ class file_check extends task_base
$this->iohandler->set_task_count($task_count); $this->iohandler->set_task_count($task_count);
$this->iohandler->set_progress('UPDATE_CHECK_FILES', 0); $this->iohandler->set_progress('UPDATE_CHECK_FILES', 0);
// Create list of default extensions that should have been added prior
// to this update
$default_update_extensions = [];
foreach (\phpbb\install\module\update_database\task\update_extensions::$default_extensions_update as $version => $extensions)
{
if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '>'))
{
$default_update_extensions = array_merge($default_update_extensions, $extensions);
}
}
foreach ($update_info['files'] as $key => $filename) foreach ($update_info['files'] as $key => $filename)
{ {
$old_file = $old_path . $filename; $old_file = $old_path . $filename;
@ -138,13 +149,25 @@ class file_check extends task_base
$progress_count++; $progress_count++;
$this->iohandler->set_progress('UPDATE_CHECK_FILES', $progress_count); $this->iohandler->set_progress('UPDATE_CHECK_FILES', $progress_count);
// Do not copy viglink again if the previous version was packaged // Do not copy default extension again if the previous version was
// with it but it does not exist (e.g. deleted by admin) // packaged with it but it does not exist (e.g. deleted by admin)
if (strpos($file, $this->phpbb_root_path . 'ext/phpbb/viglink') !== false && if (strpos($file, $this->phpbb_root_path . 'ext/') !== false)
$this->update_helper->phpbb_version_compare($update_info['version']['from'], '3.2.0', '>=') &&
!$this->filesystem->exists($this->phpbb_root_path . 'ext/phpbb/viglink/composer.json'))
{ {
continue; $skip_file = false;
foreach ($default_update_extensions as $ext_name)
{
if (strpos($file, $this->phpbb_root_path . 'ext/' . $ext_name) !== false &&
!$this->filesystem->exists($this->phpbb_root_path . 'ext/' . $ext_name . '/composer.json'))
{
$skip_file = true;
break;
}
}
if ($skip_file)
{
continue;
}
} }
if (!$this->filesystem->exists($file)) if (!$this->filesystem->exists($file))