aboutsummaryrefslogtreecommitdiffstats
path: root/tests/text_processing/make_clickable_test.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-01-31 13:26:20 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-01-31 13:26:20 +0100
commitd06657c99573e3975e735e8cb7f8cc5ccb510851 (patch)
tree4402747f36aed8c1ed7761884ad47c16876cf78e /tests/text_processing/make_clickable_test.php
parent7ff0cff4cdd477702c606bf0188d6ecaa21c833d (diff)
parente685c1c005ec146fe802f1ff6fb38cb1fe34ed7a (diff)
downloadforums-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/text_processing/make_clickable_test.php')
-rw-r--r--tests/text_processing/make_clickable_test.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
index 75a35daf82..29b982d709 100644
--- a/tests/text_processing/make_clickable_test.php
+++ b/tests/text_processing/make_clickable_test.php
@@ -7,8 +7,8 @@
*
*/
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
class phpbb_text_processing_make_clickable_test extends phpbb_test_case
{