diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-29 00:33:31 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:34 +0200 |
| commit | 2db160ff87fa42ca6c47e580de9bc9d7e5cced49 (patch) | |
| tree | 14aa95772848e1a813e338a33de8be45df401518 /phpBB/install/install_update.php | |
| parent | 40937e21c58399a847d04f23423622b0e1894446 (diff) | |
| download | forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar.gz forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar.bz2 forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar.xz forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.zip | |
[ticket/12775] Rename config_php to config_php_file
PHPBB3-12775
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 5474ae71bc..bffb2f3365 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -66,9 +66,9 @@ class install_update extends module function main($mode, $sub) { global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; - global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_handler; + global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_file; - extract($phpbb_config_php_handler->get_all()); + extract($phpbb_config_php_file->get_all()); // We must enable super globals, otherwise creating a new instance of the request class, // using the new container with a dbal connection will fail with the following PHP Notice: @@ -76,7 +76,7 @@ class install_update extends module $request->enable_super_globals(); // Create a normal container now - $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); + $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx); $phpbb_container_builder->set_dump_container(false); $phpbb_container_builder->set_use_extensions(false); if (file_exists($phpbb_root_path . 'install/update/new/config')) |