makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14492] Properly retrieve version updating from

Browse source 
PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-03-02 16:35:18 +01:00
parent f604e1ab5d
commit 64f0d74489
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 64 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/install/module/update_database/task/update.php
View file

@ -211,8 +211,6 @@ class update extends task_base
$this->iohandler->add_success_message('INLINE_UPDATE_SUCCESSFUL'); $this->iohandler->add_success_message('INLINE_UPDATE_SUCCESSFUL');
$this->config->delete('version_update_from');
$this->cache->purge(); $this->cache->purge();
$this->config->increment('assets_version', 1); $this->config->increment('assets_version', 1);

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

@ -26,6 +26,11 @@ use Symfony\Component\Finder\Finder;
*/ */
class update_extensions extends task_base class update_extensions extends task_base
{ {
/**
* @var \phpbb\cache\driver\driver_interface
*/
protected $cache;
/** /**
* @var config * @var config
*/ */
@ -92,8 +97,10 @@ class update_extensions extends task_base
$this->log = $container->get('log'); $this->log = $container->get('log');
$this->user = $container->get('user'); $this->user = $container->get('user');
$this->extension_manager = $container->get('ext.manager'); $this->extension_manager = $container->get('ext.manager');
$this->cache = $container->get('cache.driver');
$this->config = $container->get('config'); $this->config = $container->get('config');
$this->db = $container->get('dbal.conn'); $this->db = $container->get('dbal.conn');
$this->update_helper = $update_helper;
$this->finder = new Finder(); $this->finder = new Finder();
$this->finder->in($phpbb_root_path . 'ext/') $this->finder->in($phpbb_root_path . 'ext/')
->ignoreUnreadableDirs() ->ignoreUnreadableDirs()
@ -121,19 +128,17 @@ class update_extensions extends task_base
$this->user->setup(array('common', 'acp/common', 'cli')); $this->user->setup(array('common', 'acp/common', 'cli'));
$update_info = $this->install_config->get('update_info_unprocessed', []); $update_info = $this->install_config->get('update_info_unprocessed', []);
$version_from = !empty($update_info) ? $update_info['version']['from'] : $this->config['version_update_from'];
if (empty($update_info)) if (!empty($version_from))
{ {
return;
}
$update_extensions = $this->iohandler->get_input('update-extensions', []); $update_extensions = $this->iohandler->get_input('update-extensions', []);
// 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 ($this->default_update as $version => $extensions)
{ {
if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '<')) if ($this->update_helper->phpbb_version_compare($version_from, $version, '<'))
{ {
$default_update_extensions = array_merge($default_update_extensions, $extensions); $default_update_extensions = array_merge($default_update_extensions, $extensions);
} }
@ -155,7 +160,8 @@ class update_extensions extends task_base
$this->extension_manager->is_enabled($ext_name) || $this->extension_manager->is_enabled($ext_name) ||
in_array($ext_name, $update_extensions) || in_array($ext_name, $update_extensions) ||
in_array($ext_name, $default_update_extensions) in_array($ext_name, $default_update_extensions)
)) )
)
{ {
$extension_enabled = $this->extension_manager->is_enabled($ext_name); $extension_enabled = $this->extension_manager->is_enabled($ext_name);
if ($extension_enabled) if ($extension_enabled)
@ -169,8 +175,7 @@ class update_extensions extends task_base
{ {
// Create log // Create log
$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name)); $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name));
} } else
else
{ {
$this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name)); $this->iohandler->add_log_message('CLI_EXTENSION_ENABLE_FAILURE', array($ext_name));
} }
@ -184,6 +189,13 @@ class update_extensions extends task_base
} }
} }
$this->config->delete('version_update_from');
$this->cache->purge();
$this->config->increment('assets_version', 1);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */