mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-03 07:18:08 +02:00
[ticket/12775] Remove useless includes of config.php
PHPBB3-12775
This commit is contained in:
@@ -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
|
||||||
|
|
||||||
|
@@ -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);
|
||||||
|
Reference in New Issue
Block a user