From 6618f0ea246100c55636ef679df55d2c951dfbc0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 27 Nov 2013 15:18:42 +0100
Subject: [PATCH 1/2] [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
---
 phpBB/phpbb/avatar/driver/driver.php   | 11 -----------
 phpBB/phpbb/avatar/driver/gravatar.php |  8 ++++++++
 phpBB/phpbb/avatar/driver/local.php    |  8 ++++++++
 phpBB/phpbb/avatar/driver/remote.php   |  8 ++++++++
 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
@@ -109,17 +109,6 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
 		return true;
 	}
 
-	/**
-	* @inheritdoc
-	*/
-	public function get_template_name()
-	{
-		$driver = preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this));
-		$template = "ucp_avatar_options_$driver.html";
-
-		return $template;
-	}
-
 	/**
 	* @inheritdoc
 	*/
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
@@ -146,6 +146,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
 	*
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
@@ -134,6 +134,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
@@ -167,6 +167,14 @@ class upload extends \phpbb\avatar\driver\driver
 		return true;
 	}
 
+	/**
+	* @inheritdoc
+	*/
+	public function get_template_name()
+	{
+		return 'ucp_avatar_options_upload.html';
+	}
+
 	/**
 	* Check if user is able to upload an avatar
 	*

From b0a561117c557c6abe0db91c210a71d0604a07cd Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 27 Nov 2013 15:28:14 +0100
Subject: [PATCH 2/2] [ticket/11859] Add missing get_template_name method to
 test drivers

PHPBB3-11859
---
 tests/avatar/driver/barfoo.php | 5 +++++
 tests/avatar/driver/foobar.php | 5 +++++
 2 files changed, 10 insertions(+)

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';
+	}
 }