makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12775] Remove useless includes of config.php

Browse source 
PHPBB3-12775
This commit is contained in:
Tristan Darricau 2014-06-30 00:51:01 +02:00
parent ed812a9dfb
commit d226a73111
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/questionnaire/questionnaire.php
View file

@ -257,10 +257,8 @@ class phpbb_questionnaire_phpbb_data_provider
*/ */
function get_data() 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()); extract($phpbb_config_php_file->get_all());
unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution

4
phpBB/install/install_convert.php
View file

@ -136,7 +136,6 @@ class install_convert extends module
switch ($sub) switch ($sub)
{ {
case 'intro': case 'intro':
$phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_file->get_all()); extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx); 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. // This is for making sure the session get not screwed due to the 3.0.x users table being completely new.
$cache->purge(); $cache->purge();
$phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_file->get_all()); extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx); 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; 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()); extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx); 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 $convert, $convert_row, $message_parser, $skip_rows, $language;
global $request, $phpbb_config_php_file; 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()); extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx);