diff options
| author | David King <imkingdavid@gmail.com> | 2012-09-01 10:53:01 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-09-01 10:53:01 -0400 |
| commit | 4dd1bbc5879ae5fcae04341a9152e0366ed68bdd (patch) | |
| tree | a08f198b23681de07fcf51720e243dae34a268d8 | |
| parent | 7dfe26dd781e7bd0438041058e2a1d95176e7836 (diff) | |
| download | forums-4dd1bbc5879ae5fcae04341a9152e0366ed68bdd.tar forums-4dd1bbc5879ae5fcae04341a9152e0366ed68bdd.tar.gz forums-4dd1bbc5879ae5fcae04341a9152e0366ed68bdd.tar.bz2 forums-4dd1bbc5879ae5fcae04341a9152e0366ed68bdd.tar.xz forums-4dd1bbc5879ae5fcae04341a9152e0366ed68bdd.zip | |
[task/functional] Fixed DEBUG_TEST related issues
PHPBB3-10758
| -rw-r--r-- | phpBB/includes/functions_install.php | 6 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 2e10db6b24..eae136808c 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -586,7 +586,6 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = { $config_data .= "@define('DEBUG', true);\n"; $config_data .= "@define('DEBUG_EXTRA', true);\n"; - $config_data .= "@define('DEBUG_TEST', true);\n"; } else { @@ -594,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; } diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 2423299b7c..d35913e415 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -140,7 +140,7 @@ class phpbb_functional_test_case extends phpbb_test_case $this->do_request('create_table', $data); $this->do_request('config_file', $data); - file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true)); + file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true)); $this->do_request('final', $data); copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx"); |