diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-26 17:17:35 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-06-26 21:09:19 +0200 |
| commit | ff6e026a403a622bd1aa498bff396a737735faed (patch) | |
| tree | f4a73eac80dff314b786117096eb6f82f86cd7d2 /phpBB/includes/functions_container.php | |
| parent | 9b27d00d5fc8228ec4f9150aa26bcf450dc45524 (diff) | |
| download | forums-ff6e026a403a622bd1aa498bff396a737735faed.tar forums-ff6e026a403a622bd1aa498bff396a737735faed.tar.gz forums-ff6e026a403a622bd1aa498bff396a737735faed.tar.bz2 forums-ff6e026a403a622bd1aa498bff396a737735faed.tar.xz forums-ff6e026a403a622bd1aa498bff396a737735faed.zip | |
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
PHPBB3-12446
Diffstat (limited to 'phpBB/includes/functions_container.php')
| -rw-r--r-- | phpBB/includes/functions_container.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 5794d2f403..a00613c26b 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -64,9 +64,10 @@ function phpbb_bootstrap_table_prefix($config_file) * * @param string $config_file * @param string $phpbb_root_path +* @param \phpbb\db\driver\driver_interface $db The generated connection * @return array enabled extensions */ -function phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path) +function phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path, &$db) { $db = phpbb_bootstrap_db_connection($config_file); $table_prefix = phpbb_bootstrap_table_prefix($config_file); @@ -133,7 +134,7 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext) $container->setParameter('core.php_ext', $php_ext); $container->setParameter('core.table_prefix', ''); - $container->register('dbal.conn')->setSynthetic(true); + $container->register('dbal.conn.driver')->setSynthetic(true); $container->setAlias('cache.driver', 'cache.driver.install'); @@ -259,9 +260,10 @@ function phpbb_create_dumped_container_unless_debug($config_file, array $extensi function phpbb_create_default_container($phpbb_root_path, $php_ext) { $config_file = $phpbb_root_path . 'config.' . $php_ext; - $installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path); + $db = null; + $installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path, $db); - return phpbb_create_dumped_container_unless_debug( + $container = phpbb_create_dumped_container_unless_debug( $config_file, array( new \phpbb\di\extension\config($config_file), @@ -275,6 +277,10 @@ function phpbb_create_default_container($phpbb_root_path, $php_ext) $phpbb_root_path, $php_ext ); + + $container->get('dbal.conn')->set_driver($db); + + return $container; } /** |