diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-02-20 18:32:33 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-02-20 18:32:33 +0100 |
| commit | 69449417bac4244c7fc35b7bf6bb5bd056ca2a20 (patch) | |
| tree | c78de71030aae4b809d831d9e2d1703232101ff0 /tests/mock | |
| parent | 53a6cd607e36ccd099f3d83431bf8bfee48dc7b3 (diff) | |
| parent | 6902ecf6a97df44b6874c0bf4c9fa28275b7c9f7 (diff) | |
| download | forums-69449417bac4244c7fc35b7bf6bb5bd056ca2a20.tar forums-69449417bac4244c7fc35b7bf6bb5bd056ca2a20.tar.gz forums-69449417bac4244c7fc35b7bf6bb5bd056ca2a20.tar.bz2 forums-69449417bac4244c7fc35b7bf6bb5bd056ca2a20.tar.xz forums-69449417bac4244c7fc35b7bf6bb5bd056ca2a20.zip | |
Merge branch 'ticket/p/10049' into develop-olympus
* ticket/p/10049:
[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 { |