diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-12 10:21:36 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-12 10:21:36 +0100 |
| commit | 4816446c4ac75e81dfb3d102edce2864d3610775 (patch) | |
| tree | 07739b18a7792d18d325f40e4fdba7eb61e7592b /phpBB/phpbb/avatar/driver/upload.php | |
| parent | d252ef3f604b64025a7bc3723c1939c118832248 (diff) | |
| parent | b0a561117c557c6abe0db91c210a71d0604a07cd (diff) | |
| download | forums-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 'phpBB/phpbb/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 822c40af98..1e50e135e4 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -168,6 +168,14 @@ class upload extends \phpbb\avatar\driver\driver } /** + * @inheritdoc + */ + public function get_template_name() + { + return 'ucp_avatar_options_upload.html'; + } + + /** * Check if user is able to upload an avatar * * @return bool True if user can upload, false if not |