makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 17:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13740] Fix database installation

Browse source 
PHPBB3-13740
This commit is contained in:
Mate Bartus 2015-06-19 01:26:15 +02:00
parent 02029fe161
commit 08d9d567ca
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/phpbb/install/module/install_database/task/add_default_data.php
View file

@ -65,10 +65,7 @@ class add_default_data extends \phpbb\install\task_base
\phpbb\language\language $language, \phpbb\language\language $language,
$root_path) $root_path)
{ {
$dbms = $db_helper->get_available_dbms($config->get('dbms')); $this->db = $container->get('dbal.conn.driver');
$dbms = $dbms[$config->get('dbms')]['DRIVER'];
$this->db = $container->get('dbal.conn');
$this->database_helper = $db_helper; $this->database_helper = $db_helper;
$this->config = $config; $this->config = $config;
$this->iohandler = $iohandler; $this->iohandler = $iohandler;

6
phpBB/phpbb/install/module/install_database/task/create_schema.php
View file

@ -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 // Load database vendor specific code if there is any
if ($this->filesystem->exists($db_schema_path)) if ($this->filesystem->exists($db_schema_path))
@ -144,9 +144,9 @@ class create_schema extends \phpbb\install\task_base
$change_prefix = false; $change_prefix = false;
// Generate database schema // 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); $db_table_schema = json_decode($db_table_schema, true);
$change_prefix = true; $change_prefix = true;
} }