diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-11-27 15:18:42 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-11-27 15:18:42 +0100 |
| commit | 6618f0ea246100c55636ef679df55d2c951dfbc0 (patch) | |
| tree | 300fa254b1196013eeff2aa3c8432ec402d5290a | |
| parent | 125e76f9aa83141534387a965e8373c9b9cd5c4d (diff) | |
| download | forums-6618f0ea246100c55636ef679df55d2c951dfbc0.tar forums-6618f0ea246100c55636ef679df55d2c951dfbc0.tar.gz forums-6618f0ea246100c55636ef679df55d2c951dfbc0.tar.bz2 forums-6618f0ea246100c55636ef679df55d2c951dfbc0.tar.xz forums-6618f0ea246100c55636ef679df55d2c951dfbc0.zip | |
[ticket/11859] Make avatar drivers return template filename
The service name might not follow the expected naming scheme which would
cause abnormally long filenames and confusion for authors that might add
more avatar drivers.
PHPBB3-11859
| -rw-r--r-- | phpBB/phpbb/avatar/driver/driver.php | 11 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/gravatar.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/local.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/remote.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 8 |
5 files changed, 32 insertions, 11 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index d360614122..dd55f09119 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -112,17 +112,6 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface /** * @inheritdoc */ - public function get_template_name() - { - $driver = preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this)); - $template = "ucp_avatar_options_$driver.html"; - - return $template; - } - - /** - * @inheritdoc - */ public function get_name() { return $this->name; diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index d64f4da734..9f14b7f468 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -147,6 +147,14 @@ class gravatar extends \phpbb\avatar\driver\driver } /** + * @inheritdoc + */ + public function get_template_name() + { + return 'ucp_avatar_options_gravatar.html'; + } + + /** * Build gravatar URL for output on page * * @return string Gravatar URL diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php index f6acc6e636..611a44cb3d 100644 --- a/phpBB/phpbb/avatar/driver/local.php +++ b/phpBB/phpbb/avatar/driver/local.php @@ -135,6 +135,14 @@ class local extends \phpbb\avatar\driver\driver } /** + * @inheritdoc + */ + public function get_template_name() + { + return 'ucp_avatar_options_local.html'; + } + + /** * Get a list of avatars that are locally available * Results get cached for 24 hours (86400 seconds) * diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 22d50c703e..36623942df 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -186,4 +186,12 @@ class remote extends \phpbb\avatar\driver\driver 'avatar_height' => $height, ); } + + /** + * @inheritdoc + */ + public function get_template_name() + { + return 'ucp_avatar_options_remote.html'; + } } 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 |