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

[ticket/13700] Add method for initializing config after cache purge

Browse source 
PHPBB3-13700
This commit is contained in:
Marc Alexander 2021-04-03 22:31:51 +02:00
parent 7d48254cc9
commit 574de287e7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/phpbb/config/db.php
View file

@ -49,6 +49,13 @@ class db extends \phpbb\config\config
$this->cache = $cache; $this->cache = $cache;
$this->table = $table; $this->table = $table;
$this->initialise($cache);
parent::__construct($this->config);
}
public function initialise(\phpbb\cache\driver\driver_interface $cache)
{
if (($config = $cache->get('config')) !== false) if (($config = $cache->get('config')) !== false)
{ {
$sql = 'SELECT config_name, config_value $sql = 'SELECT config_name, config_value
@ -84,7 +91,7 @@ class db extends \phpbb\config\config
$cache->put('config', $cached_config); $cache->put('config', $cached_config);
} }
parent::__construct($config); $this->config = $config;
} }
/** /**

4
phpBB/phpbb/console/command/db/migrate.php
View file

@ -58,6 +58,10 @@ class migrate extends \phpbb\console\command\db\migration_command
$this->migrator->create_migrations_table(); $this->migrator->create_migrations_table();
$this->cache->purge(); $this->cache->purge();
if ($this->config instanceof \phpbb\config\db)
{
$this->config->initialise($this->cache->get_driver());
}
$this->load_migrations(); $this->load_migrations();
$orig_version = $this->config['version']; $orig_version = $this->config['version'];