diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-09-01 17:06:41 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-09-01 17:06:41 +0200 |
| commit | 3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b (patch) | |
| tree | 2f8cba60d7ebe92c39eea14e558e1aecc02a2ef1 /phpBB/includes/functions_install.php | |
| parent | 0ba2bfffe2df64e1f67ec23061365cdac2238a34 (diff) | |
| parent | 4dd1bbc5879ae5fcae04341a9152e0366ed68bdd (diff) | |
| download | forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar.gz forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar.bz2 forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.tar.xz forums-3bd19077dcd7f842e3b5fc50fcdcd7fa9299ad6b.zip | |
Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus
* github-imkingdavid/task/functional:
[task/functional] Fixed DEBUG_TEST related issues
[task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
[task/functional] Added posting tests (reply and new topic)
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -rw-r--r-- | phpBB/includes/functions_install.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 89dfb7cd2f..eae136808c 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -551,10 +551,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); @@ -591,6 +593,11 @@ 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; } |