diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-31 13:26:20 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-31 13:26:20 +0100 |
| commit | d06657c99573e3975e735e8cb7f8cc5ccb510851 (patch) | |
| tree | 4402747f36aed8c1ed7761884ad47c16876cf78e /tests/security | |
| parent | 7ff0cff4cdd477702c606bf0188d6ecaa21c833d (diff) | |
| parent | e685c1c005ec146fe802f1ff6fb38cb1fe34ed7a (diff) | |
| download | forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar.gz forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar.bz2 forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar.xz forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10011] Tests don't work on PHP < 5.3
Conflicts:
tests/security/redirect_test.php
Diffstat (limited to 'tests/security')
| -rw-r--r-- | tests/security/extract_current_page_test.php | 6 | ||||
| -rw-r--r-- | tests/security/redirect_test.php | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index ff0ab4d1bb..71c7a3a397 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -7,10 +7,10 @@ * */ -require_once __DIR__ . '/base.php'; +require_once dirname(__FILE__) . '/base.php'; -require_once __DIR__ . '/../../phpBB/includes/functions.php'; -require_once __DIR__ . '/../../phpBB/includes/session.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; class phpbb_security_extract_current_page_test extends phpbb_security_test_base { diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index 1557384507..76347d309f 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -7,9 +7,10 @@ * */ -require_once __DIR__ . '/base.php'; -require_once __DIR__ . '/../../phpBB/includes/functions.php'; -require_once __DIR__ . '/../../phpBB/includes/session.php'; +require_once dirname(__FILE__) . '/base.php'; + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; class phpbb_security_redirect_test extends phpbb_security_test_base { @@ -29,7 +30,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base protected function setUp() { parent::setUp(); - + $GLOBALS['config'] = array( 'force_server_vars' => '0', ); @@ -56,4 +57,3 @@ class phpbb_security_redirect_test extends phpbb_security_test_base } } } - |