diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-29 21:58:17 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:40 +0200 |
| commit | ed812a9dfb59b1eb83263adbaa52723ff826a791 (patch) | |
| tree | c75d2136fa2486fb994dbddb8b7fa88401237e44 /phpBB/includes/questionnaire/questionnaire.php | |
| parent | 98e8be966bd8174c2a3f4e8fb80167b23573441f (diff) | |
| download | forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar.gz forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar.bz2 forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar.xz forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.zip | |
[ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
PHPBB3-12775
Diffstat (limited to 'phpBB/includes/questionnaire/questionnaire.php')
| -rw-r--r-- | phpBB/includes/questionnaire/questionnaire.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index b4b01a74bf..302419618e 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -258,10 +258,13 @@ class phpbb_questionnaire_phpbb_data_provider function get_data() { global $phpbb_root_path, $phpEx; - include("{$phpbb_root_path}config.$phpEx"); + + $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 - $dbms = phpbb_convert_30_dbms_to_31($dbms); + $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); // Only send certain config vars $config_vars = array( |