aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/avatar
diff options
context:
space:
mode:
authorjaviexin <javiexin@gmail.com>2015-07-30 01:43:18 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-01-02 17:16:14 +0100
commit06f4b6926baaf27897b2f57f7938eed4acf5dedb (patch)
tree67b3e2a51a60336c65f204cd9931b68805b6f17d /phpBB/phpbb/avatar
parent14dc274e9e3568a276c654b0845252019525fb6f (diff)
downloadforums-06f4b6926baaf27897b2f57f7938eed4acf5dedb.tar
forums-06f4b6926baaf27897b2f57f7938eed4acf5dedb.tar.gz
forums-06f4b6926baaf27897b2f57f7938eed4acf5dedb.tar.bz2
forums-06f4b6926baaf27897b2f57f7938eed4acf5dedb.tar.xz
forums-06f4b6926baaf27897b2f57f7938eed4acf5dedb.zip
[ticket/14387] Extend avatar-driver by extension in ACP not possible
Create two driver methods to provide the driver config name and the driver ACP template name, and use them within the manager method. Default driver config name and template name are the same as now. But new drivers are able to override the config name and template name with their own, including @vendor_extension. PHPBB3-14387
Diffstat (limited to 'phpBB/phpbb/avatar')
-rw-r--r--phpBB/phpbb/avatar/driver/driver.php8
-rw-r--r--phpBB/phpbb/avatar/driver/driver_interface.php7
-rw-r--r--phpBB/phpbb/avatar/manager.php12
3 files changed, 27 insertions, 0 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index a23b626e50..ad186635f2 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -128,6 +128,14 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
}
/**
+ * {@inheritdoc}
+ */
+ public function get_acp_template_name()
+ {
+ return 'acp_avatar_options_' . $this->get_config_name() . '.html';
+ }
+
+ /**
* Sets the name of the driver.
*
* @param string $name Driver name
diff --git a/phpBB/phpbb/avatar/driver/driver_interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php
index d984717d74..7d6c2cff8a 100644
--- a/phpBB/phpbb/avatar/driver/driver_interface.php
+++ b/phpBB/phpbb/avatar/driver/driver_interface.php
@@ -117,4 +117,11 @@ interface driver_interface
* @return string Avatar driver's template name
*/
public function get_template_name();
+
+ /**
+ * Get the avatar driver's template name (ACP)
+ *
+ * @return string Avatar driver's template name
+ */
+ public function get_acp_template_name();
}
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index 5274ac6a26..5db9ab13fb 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -280,6 +280,18 @@ class manager
}
/**
+ * Get the template name of an avatar driver
+ *
+ * @param object $driver Avatar driver object
+ *
+ * @return string Avatar driver template name
+ */
+ public function get_driver_template_name($driver)
+ {
+ return $driver->get_acp_template_name();
+ }
+
+ /**
* Replace "error" strings with their real, localized form
*
* @param \phpbb\user phpBB User object