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/regex | |
| 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/regex')
| -rw-r--r-- | tests/regex/censor_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/email_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/ipv4_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/ipv6_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/url_test.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php index 93c761c8d0..fa9104e71d 100644 --- a/tests/regex/censor_test.php +++ b/tests/regex/censor_test.php @@ -7,7 +7,7 @@ * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; class phpbb_regex_censor_test extends phpbb_test_case { diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php index 5d6e207cbb..0695b801d5 100644 --- a/tests/regex/email_test.php +++ b/tests/regex/email_test.php @@ -7,7 +7,7 @@ * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; class phpbb_regex_email_test extends phpbb_test_case { diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php index 735a2c4384..9829547508 100644 --- a/tests/regex/ipv4_test.php +++ b/tests/regex/ipv4_test.php @@ -7,7 +7,7 @@ * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; class phpbb_regex_ipv4_test extends phpbb_test_case { diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php index 187588f861..1b2018403c 100644 --- a/tests/regex/ipv6_test.php +++ b/tests/regex/ipv6_test.php @@ -7,7 +7,7 @@ * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; class phpbb_regex_ipv6_test extends phpbb_test_case { diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php index 246cbf549c..c3a336063a 100644 --- a/tests/regex/url_test.php +++ b/tests/regex/url_test.php @@ -7,7 +7,7 @@ * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; class phpbb_regex_url_test extends phpbb_test_case { |