diff options
author | Andreas Fischer <bantu@phpbb.com> | 2012-02-04 00:31:59 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2012-02-04 00:38:16 +0100 |
commit | c0b3239bf39f6a052dd8f481561ca0442f19ede8 (patch) | |
tree | 0f94982bffdbf9390fd4eac9776943af0a029f22 /tests | |
parent | 2ae6b8a5eda3425c1798c11d3b663205eaf2f07e (diff) | |
download | forums-c0b3239bf39f6a052dd8f481561ca0442f19ede8.tar forums-c0b3239bf39f6a052dd8f481561ca0442f19ede8.tar.gz forums-c0b3239bf39f6a052dd8f481561ca0442f19ede8.tar.bz2 forums-c0b3239bf39f6a052dd8f481561ca0442f19ede8.tar.xz forums-c0b3239bf39f6a052dd8f481561ca0442f19ede8.zip |
[ticket/10512] Call startup.php from tests/bootstrap.php
PHPBB3-10512
Diffstat (limited to 'tests')
-rw-r--r-- | tests/bootstrap.php | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 16aed68405..2fb805043e 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -10,25 +10,9 @@ define('IN_PHPBB', true); $phpbb_root_path = 'phpBB/'; $phpEx = 'php'; -$table_prefix = 'phpbb_'; - -if (!defined('E_DEPRECATED')) -{ - define('E_DEPRECATED', 8192); -} -error_reporting(E_ALL & ~E_DEPRECATED); - -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) -{ - define('STRIP', false); -} -else -{ - @set_magic_quotes_runtime(0); - define('STRIP', (get_magic_quotes_gpc()) ? true : false); -} +require_once $phpbb_root_path . 'includes/startup.php'; +$table_prefix = 'phpbb_'; require_once $phpbb_root_path . 'includes/constants.php'; require_once 'test_framework/phpbb_test_case_helpers.php'; |