aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-03-07 17:13:23 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-03-07 17:13:23 +0100
commitcda3ba62b9e87a53cf46608f157591535627b008 (patch)
tree610bc62371402bcee4e543160ca960b634e674f0
parentbd03419f87aa98575d9f82745568635b88a9be0e (diff)
parent4f14ae94e2afb476e96b52b922342f98ddc66f84 (diff)
downloadforums-cda3ba62b9e87a53cf46608f157591535627b008.tar
forums-cda3ba62b9e87a53cf46608f157591535627b008.tar.gz
forums-cda3ba62b9e87a53cf46608f157591535627b008.tar.bz2
forums-cda3ba62b9e87a53cf46608f157591535627b008.tar.xz
forums-cda3ba62b9e87a53cf46608f157591535627b008.zip
Merge branch 'ticket/naderman/10011' into develop
* ticket/naderman/10011: [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
-rw-r--r--tests/cron/manager_test.php12
-rw-r--r--tests/lock/db_test.php2
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php
index 6288a5c641..490d3ed225 100644
--- a/tests/cron/manager_test.php
+++ b/tests/cron/manager_test.php
@@ -7,12 +7,12 @@
*
*/
-require_once __DIR__ . '/../mock/cache.php';
-require_once __DIR__ . '/task/testmod/dummy_task.php';
-require_once __DIR__ . '/task/testmod/second_dummy_task.php';
-require_once __DIR__ . '/task2/testmod/simple_ready.php';
-require_once __DIR__ . '/task2/testmod/simple_not_runnable.php';
-require_once __DIR__ . '/task2/testmod/simple_should_not_run.php';
+require_once dirname(__FILE__) . '/../mock/cache.php';
+require_once dirname(__FILE__) . '/task/testmod/dummy_task.php';
+require_once dirname(__FILE__) . '/task/testmod/second_dummy_task.php';
+require_once dirname(__FILE__) . '/task2/testmod/simple_ready.php';
+require_once dirname(__FILE__) . '/task2/testmod/simple_not_runnable.php';
+require_once dirname(__FILE__) . '/task2/testmod/simple_should_not_run.php';
class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
{
diff --git a/tests/lock/db_test.php b/tests/lock/db_test.php
index 3b2e3ea3b2..ed15423314 100644
--- a/tests/lock/db_test.php
+++ b/tests/lock/db_test.php
@@ -7,7 +7,7 @@
*
*/
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
class phpbb_lock_db_test extends phpbb_database_test_case
{