From 574de287e759a4533ff36f4fe0f3628b76ac1ba0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 3 Apr 2021 22:31:51 +0200
Subject: [PATCH] [ticket/13700] Add method for initializing config after cache
 purge

PHPBB3-13700
---
 phpBB/phpbb/config/db.php                  | 9 ++++++++-
 phpBB/phpbb/console/command/db/migrate.php | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php
index 26489bdd34..ae5024e22d 100644
--- a/phpBB/phpbb/config/db.php
+++ b/phpBB/phpbb/config/db.php
@@ -49,6 +49,13 @@ class db extends \phpbb\config\config
 		$this->cache = $cache;
 		$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)
 		{
 			$sql = 'SELECT config_name, config_value
@@ -84,7 +91,7 @@ class db extends \phpbb\config\config
 			$cache->put('config', $cached_config);
 		}
 
-		parent::__construct($config);
+		$this->config = $config;
 	}
 
 	/**
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index 4270e2d703..e2cacb0b14 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -58,6 +58,10 @@ class migrate extends \phpbb\console\command\db\migration_command
 		$this->migrator->create_migrations_table();
 
 		$this->cache->purge();
+		if ($this->config instanceof \phpbb\config\db)
+		{
+			$this->config->initialise($this->cache->get_driver());
+		}
 
 		$this->load_migrations();
 		$orig_version = $this->config['version'];