diff options
author | David King <imkingdavid@gmail.com> | 2013-08-31 13:37:11 -0700 |
---|---|---|
committer | David King <imkingdavid@gmail.com> | 2013-08-31 13:37:11 -0700 |
commit | af1eb7466f11cdb0f851acfcacd957267e20e3ce (patch) | |
tree | 1c72f7436ffcaa0d355ee11a0375323dcf5731f6 /tests/controller/controller_test.php | |
parent | 9485eea0987478da25327a06a4fd36943ca1c01c (diff) | |
parent | 9d6370751f1b998e3da448e16c1446b33ddd17d0 (diff) | |
download | forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.gz forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.bz2 forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.xz forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.zip |
Merge branch 'develop' into ticket/11215
Diffstat (limited to 'tests/controller/controller_test.php')
-rw-r--r-- | tests/controller/controller_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index c06bf7d548..dfc4f80469 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -59,7 +59,7 @@ class phpbb_controller_controller_test extends phpbb_test_case } if (!class_exists('phpbb_controller_foo')) { - include(__DIR__.'/includes/controller/foo.php'); + include(__DIR__.'/phpbb/controller/foo.php'); } $resolver = new phpbb_controller_resolver(new phpbb_user, $container); |