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_convert.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_convert.php')
| -rw-r--r-- | phpBB/install/install_convert.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 8f77d0be9a..f9985da1ea 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -107,7 +107,7 @@ class install_convert extends module function main($mode, $sub) { global $lang, $template, $phpbb_root_path, $phpEx, $cache, $config, $language, $table_prefix; - global $convert, $request, $phpbb_container, $phpbb_config_php_handler; + global $convert, $request, $phpbb_container, $phpbb_config_php_file; $this->tpl_name = 'install_convert'; $this->mode = $mode; @@ -127,7 +127,7 @@ class install_convert extends module // Enable super globals to prevent issues with the new \phpbb\request\request object $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 = $phpbb_container_builder->get_container(); // Create cache @@ -136,8 +136,8 @@ class install_convert extends module switch ($sub) { case 'intro': - $phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx); - extract($phpbb_config_php_handler->get_all()); + $phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx); + extract($phpbb_config_php_file->get_all()); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); @@ -227,8 +227,8 @@ class install_convert extends module // This is for making sure the session get not screwed due to the 3.0.x users table being completely new. $cache->purge(); - $phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx); - extract($phpbb_config_php_handler->get_all()); + $phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx); + extract($phpbb_config_php_file->get_all()); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); @@ -375,10 +375,10 @@ class install_convert extends module */ function get_convert_settings($sub) { - global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache, $phpbb_config_php_handler; + global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache, $phpbb_config_php_file; - $phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx); - extract($phpbb_config_php_handler->get_all()); + $phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx); + extract($phpbb_config_php_file->get_all()); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); @@ -621,10 +621,10 @@ class install_convert extends module { global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache, $auth; global $convert, $convert_row, $message_parser, $skip_rows, $language; - global $request, $phpbb_config_php_handler; + global $request, $phpbb_config_php_file; - $phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx); - extract($phpbb_config_php_handler->get_all()); + $phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx); + extract($phpbb_config_php_file->get_all()); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); |