diff options
| -rw-r--r-- | phpBB/includes/questionnaire/questionnaire.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 302419618e..63ea432863 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -257,10 +257,8 @@ class phpbb_questionnaire_phpbb_data_provider */ function get_data() { - global $phpbb_root_path, $phpEx; + global $phpbb_root_path, $phpEx, $phpbb_config_php_file; - $phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx); - $phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx); extract($phpbb_config_php_file->get_all()); unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 4a37ad19b9..17161b5eae 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -136,7 +136,6 @@ class install_convert extends module switch ($sub) { case 'intro': - $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); @@ -227,7 +226,6 @@ 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_file->set_config_file($phpbb_root_path . 'config.' . $phpEx); extract($phpbb_config_php_file->get_all()); require($phpbb_root_path . 'includes/constants.' . $phpEx); @@ -377,7 +375,6 @@ class install_convert extends module { global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache, $phpbb_config_php_file; - $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); @@ -624,7 +621,6 @@ class install_convert extends module global $convert, $convert_row, $message_parser, $skip_rows, $language; global $request, $phpbb_config_php_file; - $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); |