diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-13 11:33:49 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-13 11:33:49 -0400 |
| commit | 2bc918d3f9282de887cc09f830ff35073865366e (patch) | |
| tree | af266a7b312ae4e4f9fdddb952d2f53e5d240c06 /phpBB/includes/functions_container.php | |
| parent | 068d35065278bf52e85fcc96b629d25712f19c26 (diff) | |
| parent | fd10d97cb1e6c43b88b923bab1015cafe03d379c (diff) | |
| download | forums-2bc918d3f9282de887cc09f830ff35073865366e.tar forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.gz forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.bz2 forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.xz forums-2bc918d3f9282de887cc09f830ff35073865366e.zip | |
Merge branch 'develop' into ticket/11215
* develop: (53 commits)
[ticket/11671] Update composer.lock
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps
[ticket/11668] Move lint test to the end for travis
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
...
Diffstat (limited to 'phpBB/includes/functions_container.php')
| -rw-r--r-- | phpBB/includes/functions_container.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 0575f00a0b..f63dde0614 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -33,7 +33,10 @@ function phpbb_bootstrap_db_connection($config_file) require($config_file); $dbal_driver_class = phpbb_convert_30_dbms_to_31($dbms); - return new $dbal_driver_class($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, defined('PHPBB_DB_NEW_LINK')); + $db = new $dbal_driver_class(); + $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, defined('PHPBB_DB_NEW_LINK')); + + return $db; } /** @@ -56,9 +59,10 @@ function phpbb_bootstrap_table_prefix($config_file) * Used to bootstrap the container. * * @param string $config_file +* @param string $phpbb_root_path * @return array enabled extensions */ -function phpbb_bootstrap_enabled_exts($config_file) +function phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path) { $db = phpbb_bootstrap_db_connection($config_file); $table_prefix = phpbb_bootstrap_table_prefix($config_file); @@ -142,7 +146,7 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext) */ function phpbb_create_compiled_container($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext) { - $installed_exts = phpbb_bootstrap_enabled_exts($config_file); + $installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path); // Now pass the enabled extension paths into the ext compiler extension $extensions[] = new phpbb_di_extension_ext($installed_exts); @@ -179,7 +183,7 @@ function phpbb_create_dumped_container($config_file, array $extensions, array $p return new phpbb_cache_container(); } - $container = phpbb_create_compiled_container($extensions, $passes, $phpbb_root_path, $php_ext); + $container = phpbb_create_compiled_container($config_file, $extensions, $passes, $phpbb_root_path, $php_ext); // Lastly, we create our cached container class $dumper = new PhpDumper($container); @@ -212,7 +216,7 @@ function phpbb_create_dumped_container($config_file, array $extensions, array $p function phpbb_create_dumped_container_unless_debug($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext) { $container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container'; - return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext); + return $container_factory($config_file, $extensions, $passes, $phpbb_root_path, $php_ext); } /** |