diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-02-20 18:33:59 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-02-20 18:33:59 +0100 |
| commit | a89be371e8f32474c2eb83d86342523fbd9e865c (patch) | |
| tree | b529d05534bd29a1cb7aa738dded6a0b2344c9d0 /tests/mock | |
| parent | c025d6079b3883dae133e23bca39dbcb35c4c064 (diff) | |
| parent | 69449417bac4244c7fc35b7bf6bb5bd056ca2a20 (diff) | |
| download | forums-a89be371e8f32474c2eb83d86342523fbd9e865c.tar forums-a89be371e8f32474c2eb83d86342523fbd9e865c.tar.gz forums-a89be371e8f32474c2eb83d86342523fbd9e865c.tar.bz2 forums-a89be371e8f32474c2eb83d86342523fbd9e865c.tar.xz forums-a89be371e8f32474c2eb83d86342523fbd9e865c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10049] Mark session init test incomplete for now.
[ticket/10049] Mark session continue test incomplete for now.
[ticket/10049] Globalize $_SID.
[ticket/10049] Chase assertResultEquals rename.
[ticket/10049] Fixed requires in session tests and mock.
[ticket/10049] Renamed session test files to proper file names.
Diffstat (limited to 'tests/mock')
| -rw-r--r-- | tests/mock/session_testable.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php index 2d7d42f82a..0d4642d372 100644 --- a/tests/mock/session_testable.php +++ b/tests/mock/session_testable.php @@ -7,8 +7,8 @@ * */ -require_once '../phpBB/includes/functions.php'; -require_once '../phpBB/includes/session.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; class phpbb_mock_session_testable extends session { |