mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/10748] Replace direct creations of tools();

Browse Source 
PHPBB3-10748
This commit is contained in:
Joas Schilling
2015-01-24 12:06:45 +01:00
parent 4ea90ca44d
commit 37ae99c75d
19 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/convertors/functions_phpbb20.php
View File

@@ -1926,7 +1926,9 @@ 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\tools($db), $phpbb_root_path, $phpEx, $table_prefix);
$factory = new \phpbb\db\tools\factory();
$timezone_migration = new \phpbb\db\migration\data\v310\timezone($config, $db, $factory->get($db), $phpbb_root_path, $phpEx, $table_prefix);
return $timezone_migration->convert_phpbb30_timezone($timezone, 0);
}

7
phpBB/install/install_install.php
View File

@@ -1200,7 +1200,9 @@ 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\tools($sqlite_db, true), $phpbb_root_path, $phpEx, $table_prefix);
$factory = new \phpbb\db\tools\factory();
$db_tools = $factory->get($sqlite_db, true);
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $sqlite_db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix);
$db_table_schema = $schema_generator->get_schema();
}
@@ -1212,7 +1214,8 @@ class install_install extends module
define('CONFIG_TABLE', $data['table_prefix'] . 'config');
}
$db_tools = new \phpbb\db\tools\tools($db);
$factory = new \phpbb\db\tools\factory();
$db_tools = $factory->get($db);
foreach ($db_table_schema as $table_name => $table_data)
{
$db_tools->sql_create_table(