makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[task/functional] Fixed DEBUG_TEST related issues

Browse source 
PHPBB3-10758
This commit is contained in:
David King 2012-09-01 10:53:01 -04:00
parent 7dfe26dd78
commit 4dd1bbc587
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/functions_install.php
View file

@ -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', true);\n";
$config_data .= "@define('DEBUG_EXTRA', true);\n"; $config_data .= "@define('DEBUG_EXTRA', true);\n";
$config_data .= "@define('DEBUG_TEST', true);\n";
} }
else else
{ {
@ -594,6 +593,11 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug =
$config_data .= "// @define('DEBUG_EXTRA', true);\n"; $config_data .= "// @define('DEBUG_EXTRA', true);\n";
} }
if ($debug_test)
{
$config_data .= "@define('DEBUG_TEST', true);\n";
}
return $config_data; return $config_data;
} }

2
tests/test_framework/phpbb_functional_test_case.php
View file

@ -140,7 +140,7 @@ class phpbb_functional_test_case extends phpbb_test_case
$this->do_request('create_table', $data); $this->do_request('create_table', $data);
$this->do_request('config_file', $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); $this->do_request('final', $data);
copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx"); copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");