diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-12-10 00:03:24 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-12-10 00:03:24 +0100 |
| commit | d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e (patch) | |
| tree | 27495229af76de3996f8a2996dee1c6e52cc93c2 /phpBB/install | |
| parent | 8a357181492ef7c41ed6289ef1c5e8e0e4bdd6be (diff) | |
| parent | ec90f2b380a598a3dbf7ada0e95878d9d1b85cbe (diff) | |
| download | forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar.gz forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar.bz2 forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.tar.xz forums-d22fa412c4ec3d52c3a1d41bfb9f968bbbf3a94e.zip | |
Merge pull request #3220 from nickvergessen/ticket/13421
Ticket/13421 Introduce an interface for db\tools.php
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 817c007274..7794b5ca67 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1926,7 +1926,7 @@ function phpbb_check_username_collisions() function phpbb_convert_timezone($timezone) { global $config, $db, $phpbb_root_path, $phpEx, $table_prefix; - $timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools($db), $phpbb_root_path, $phpEx, $table_prefix); + $timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, new \phpbb\db\tools\tools($db), $phpbb_root_path, $phpEx, $table_prefix); return $timezone_migration->convert_phpbb30_timezone($timezone, 0); } diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 103262b516..4ef6df172a 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1197,7 +1197,7 @@ class install_install extends module ->get_classes(); $sqlite_db = new \phpbb\db\driver\sqlite(); - $schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $sqlite_db, new \phpbb\db\tools($sqlite_db, true), $phpbb_root_path, $phpEx, $table_prefix); + $schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $sqlite_db, new \phpbb\db\tools\tools($sqlite_db, true), $phpbb_root_path, $phpEx, $table_prefix); $db_table_schema = $schema_generator->get_schema(); } @@ -1209,7 +1209,7 @@ class install_install extends module define('CONFIG_TABLE', $data['table_prefix'] . 'config'); } - $db_tools = new \phpbb\db\tools($db); + $db_tools = new \phpbb\db\tools\tools($db); foreach ($db_table_schema as $table_name => $table_data) { $db_tools->sql_create_table( |