2 files changed, 13 insertions, 6 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index a214356ac3..9801b817d6 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -185,6 +185,7 @@ class container_builder
 		}
 
 		$this->container->set('config.php', $this->config_php_file);
+		$this->inject_dbal_driver();
 
 		if ($this->compile_container)
 		{
@@ -304,6 +305,17 @@ class container_builder
 	}
 
 	/**
+	 * Inject the dbal connection driver into container
+	 */
+	protected function inject_dbal_driver()
+	{
+		if (!empty($this->config_php_file->get_all()))
+		{
+			$this->container->set('dbal.conn.driver', $this->get_dbal_connection());
+		}
+	}
+
+	/**
 	* Get DB connection.
 	*
 	* @return \phpbb\db\driver\driver_interface
@@ -320,6 +332,7 @@ class container_builder
 				$this->config_php_file->get('dbpasswd'),
 				$this->config_php_file->get('dbname'),
 				$this->config_php_file->get('dbport'),
+				false,
 				defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK
 			);
 		}
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index 7984a783df..8c9de48823 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -43,12 +43,6 @@ class config extends Extension
 			'core.adm_relative_path'	=> $this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/',
 			'core.table_prefix'			=> $this->config_php->get('table_prefix'),
 			'cache.driver.class'		=> $this->convert_30_acm_type($this->config_php->get('acm_type')),
-			'dbal.driver.class'			=> $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms')),
-			'dbal.dbhost'				=> $this->config_php->get('dbhost'),
-			'dbal.dbuser'				=> $this->config_php->get('dbuser'),
-			'dbal.dbpasswd'				=> $this->config_php->get('dbpasswd'),
-			'dbal.dbname'				=> $this->config_php->get('dbname'),
-			'dbal.dbport'				=> $this->config_php->get('dbport'),
 			'dbal.new_link'				=> defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK,
 		);
 		$parameter_bag = $container->getParameterBag();