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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-06-19 22:36:22 +02:00
commit 37658d02f1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/install/module/install_finish/task/install_extensions.php
View file

@ -73,6 +73,7 @@ class install_extensions extends \phpbb\install\task_base
$this->extension_table = $container->get_parameter('tables.ext'); $this->extension_table = $container->get_parameter('tables.ext');
$this->log = $container->get('log'); $this->log = $container->get('log');
$this->config = $container->get('config');
$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->db = $container->get('dbal.conn'); $this->db = $container->get('dbal.conn');
@ -87,15 +88,13 @@ class install_extensions extends \phpbb\install\task_base
$cache = $container->get('cache.driver'); $cache = $container->get('cache.driver');
$cache->destroy('config'); $cache->destroy('config');
$this->config = new db( global $config;
$config = new db(
$this->db, $this->db,
$cache, $cache,
$container->get_parameter('tables.config') $container->get_parameter('tables.config')
); );
global $config;
$config = $this->config;
// Make sure asset version exists in config. Otherwise we might try to // Make sure asset version exists in config. Otherwise we might try to
// insert the assets_version setting into the database and cause a // insert the assets_version setting into the database and cause a
// duplicate entry error. // duplicate entry error.