aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-12-12 10:21:36 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-12-12 10:21:36 +0100
commit4816446c4ac75e81dfb3d102edce2864d3610775 (patch)
tree07739b18a7792d18d325f40e4fdba7eb61e7592b /tests
parentd252ef3f604b64025a7bc3723c1939c118832248 (diff)
parentb0a561117c557c6abe0db91c210a71d0604a07cd (diff)
downloadforums-4816446c4ac75e81dfb3d102edce2864d3610775.tar
forums-4816446c4ac75e81dfb3d102edce2864d3610775.tar.gz
forums-4816446c4ac75e81dfb3d102edce2864d3610775.tar.bz2
forums-4816446c4ac75e81dfb3d102edce2864d3610775.tar.xz
forums-4816446c4ac75e81dfb3d102edce2864d3610775.zip
Merge remote-tracking branch 'Marc/ticket/11859' into develop
* Marc/ticket/11859: [ticket/11859] Add missing get_template_name method to test drivers [ticket/11859] Make avatar drivers return template filename
Diffstat (limited to 'tests')
-rw-r--r--tests/avatar/driver/barfoo.php5
-rw-r--r--tests/avatar/driver/foobar.php5
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/avatar/driver/barfoo.php b/tests/avatar/driver/barfoo.php
index 11c100db36..0bf30b8a91 100644
--- a/tests/avatar/driver/barfoo.php
+++ b/tests/avatar/driver/barfoo.php
@@ -18,4 +18,9 @@ class barfoo extends \phpbb\avatar\driver\driver
{
return false;
}
+
+ public function get_template_name()
+ {
+ return 'barfoo.html';
+ }
}
diff --git a/tests/avatar/driver/foobar.php b/tests/avatar/driver/foobar.php
index a1e7bdf7cc..aabdaf5ac4 100644
--- a/tests/avatar/driver/foobar.php
+++ b/tests/avatar/driver/foobar.php
@@ -18,4 +18,9 @@ class foobar extends \phpbb\avatar\driver\driver
{
return false;
}
+
+ public function get_template_name()
+ {
+ return 'foobar.html';
+ }
}