diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-06-19 01:26:15 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-08 01:28:07 +0200 |
| commit | 08d9d567ca9fb52b18be5d8f709ba7b1699fd34f (patch) | |
| tree | a67bfa4b38fa337355f7f39015dea0d63fd74429 /phpBB/phpbb/install/module/install_database | |
| parent | 02029fe1610e5aa1792f24a4d748c6ed08bfc5fc (diff) | |
| download | forums-08d9d567ca9fb52b18be5d8f709ba7b1699fd34f.tar forums-08d9d567ca9fb52b18be5d8f709ba7b1699fd34f.tar.gz forums-08d9d567ca9fb52b18be5d8f709ba7b1699fd34f.tar.bz2 forums-08d9d567ca9fb52b18be5d8f709ba7b1699fd34f.tar.xz forums-08d9d567ca9fb52b18be5d8f709ba7b1699fd34f.zip | |
[ticket/13740] Fix database installation
PHPBB3-13740
Diffstat (limited to 'phpBB/phpbb/install/module/install_database')
| -rw-r--r-- | phpBB/phpbb/install/module/install_database/task/add_default_data.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/install_database/task/create_schema.php | 6 |
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; } |