2 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/phpbb/install/module/install_database/task/add_default_data.php b/phpBB/phpbb/install/module/install_database/task/add_default_data.php
index 44b614f4de..1e1eb10403 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_default_data.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_default_data.php
@@ -65,10 +65,7 @@ class add_default_data extends \phpbb\install\task_base
 								\phpbb\language\language $language,
 								$root_path)
 	{
-		$dbms = $db_helper->get_available_dbms($config->get('dbms'));
-		$dbms = $dbms[$config->get('dbms')]['DRIVER'];
-
-		$this->db				= $container->get('dbal.conn');
+		$this->db				= $container->get('dbal.conn.driver');
 		$this->database_helper	= $db_helper;
 		$this->config			= $config;
 		$this->iohandler		= $iohandler;
diff --git a/phpBB/phpbb/install/module/install_database/task/create_schema.php b/phpBB/phpbb/install/module/install_database/task/create_schema.php
index 7cc521eee8..556bfd5e81 100644
--- a/phpBB/phpbb/install/module/install_database/task/create_schema.php
+++ b/phpBB/phpbb/install/module/install_database/task/create_schema.php
@@ -119,7 +119,7 @@ class create_schema extends \phpbb\install\task_base
 			}
 		}
 
-		$db_schema_path = $this->phpbb_root_path . 'install/schemas/' . $schema_name . '_schema.sql';
+		$db_schema_path = $this->phpbb_root_path . 'phpbb/install/schemas/' . $schema_name . '_schema.sql';
 
 		// Load database vendor specific code if there is any
 		if ($this->filesystem->exists($db_schema_path))
@@ -144,9 +144,9 @@ class create_schema extends \phpbb\install\task_base
 		$change_prefix = false;
 
 		// Generate database schema
-		if ($this->filesystem->exists($this->phpbb_root_path . 'install/schemas/schema.json'))
+		if ($this->filesystem->exists($this->phpbb_root_path . 'phpbb/install/schemas/schema.json'))
 		{
-			$db_table_schema = @file_get_contents($this->phpbb_root_path . 'install/schemas/schema.json');
+			$db_table_schema = @file_get_contents($this->phpbb_root_path . 'phpbb/install/schemas/schema.json');
 			$db_table_schema = json_decode($db_table_schema, true);
 			$change_prefix = true;
 		}