diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-10 01:29:23 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-10 01:29:23 -0500 |
| commit | 9c2d73c3f9f29ec0bc5a33e0ad7166ed0cd008f9 (patch) | |
| tree | ff9c79ee57ca07fc39b71e5a0357a965530dbf14 | |
| parent | 3feeb382c5faa00cbe69870ed7b96e927f8f59e2 (diff) | |
| parent | c0b3239bf39f6a052dd8f481561ca0442f19ede8 (diff) | |
| download | forums-9c2d73c3f9f29ec0bc5a33e0ad7166ed0cd008f9.tar forums-9c2d73c3f9f29ec0bc5a33e0ad7166ed0cd008f9.tar.gz forums-9c2d73c3f9f29ec0bc5a33e0ad7166ed0cd008f9.tar.bz2 forums-9c2d73c3f9f29ec0bc5a33e0ad7166ed0cd008f9.tar.xz forums-9c2d73c3f9f29ec0bc5a33e0ad7166ed0cd008f9.zip | |
Merge remote-tracking branch 'bantu/ticket/10512' into develop-olympus
* bantu/ticket/10512:
[ticket/10512] Call startup.php from tests/bootstrap.php
| -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'; |