diff options
| author | Unknown Bliss <m@michaelcullum.com> | 2012-09-01 21:15:39 +0100 |
|---|---|---|
| committer | Unknown Bliss <m@michaelcullum.com> | 2012-09-01 21:15:39 +0100 |
| commit | 79da1ea59291ae91acf570fe5b705d80f1d29253 (patch) | |
| tree | 0e69c121b02d38d2be4959e22d5aa67210af5a36 /phpBB/includes/functions_install.php | |
| parent | 0c35ee2769d3945f25275d5ee7a130b7596d289f (diff) | |
| parent | 43190ebecaeadbc8738da9dcb33b9163652fb9f3 (diff) | |
| download | forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar.gz forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar.bz2 forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar.xz forums-79da1ea59291ae91acf570fe5b705d80f1d29253.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
Conflicts:
phpBB/common.php
phpBB/download/file.php
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -rw-r--r-- | phpBB/includes/functions_install.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 46541acd44..10ec13669b 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -522,10 +522,12 @@ function adjust_language_keys_callback($matches) * @param string $dbms The name of the DBAL class to use * @param array $load_extensions Array of additional extensions that should be loaded * @param bool $debug If the debug constants should be enabled by default or not +* @param bool $debug_test If the DEBUG_TEST constant should be added +* NOTE: Only for use within the testing framework * * @return string The output to write to the file */ -function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = false) +function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = false, $debug_test = false) { $load_extensions = implode(',', $load_extensions); @@ -540,7 +542,7 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = 'dbuser' => $data['dbuser'], 'dbpasswd' => htmlspecialchars_decode($data['dbpasswd']), 'table_prefix' => $data['table_prefix'], - 'acm_type' => 'file', + 'acm_type' => 'phpbb_cache_driver_file', 'load_extensions' => $load_extensions, ); @@ -562,5 +564,10 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = $config_data .= "// @define('DEBUG_EXTRA', true);\n"; } + if ($debug_test) + { + $config_data .= "@define('DEBUG_TEST', true);\n"; + } + return $config_data; } |