aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/avatar
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-12-04 15:11:14 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-12-04 15:11:14 +0100
commit8aaa3e055fdc50faeea6f590408a7bcbb03a8d92 (patch)
treea049fb9836496f88e5a820d5d73072c1c4665013 /phpBB/includes/avatar
parentfc4069f81df54630a5ac8c1373c38f4834553012 (diff)
downloadforums-8aaa3e055fdc50faeea6f590408a7bcbb03a8d92.tar
forums-8aaa3e055fdc50faeea6f590408a7bcbb03a8d92.tar.gz
forums-8aaa3e055fdc50faeea6f590408a7bcbb03a8d92.tar.bz2
forums-8aaa3e055fdc50faeea6f590408a7bcbb03a8d92.tar.xz
forums-8aaa3e055fdc50faeea6f590408a7bcbb03a8d92.zip
[feature/avatars] Use seperate function for retrieving the config name
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar')
-rw-r--r--phpBB/includes/avatar/manager.php18
1 files changed, 15 insertions, 3 deletions
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 279278b71c..81a135b46f 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -203,7 +203,7 @@ class phpbb_avatar_manager
*/
public function is_enabled($driver)
{
- $config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+ $config_name = $this->get_driver_config_name($driver);
return $this->config["allow_avatar_{$config_name}"];
}
@@ -211,16 +211,28 @@ class phpbb_avatar_manager
/**
* Get the settings array for enabling/disabling an avatar driver
*
- * @param string $driver Avatar driver object
+ * @param object $driver Avatar driver object
*
* @return array Array of configuration options as consumed by acp_board
*/
public function get_avatar_settings($driver)
{
- $config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+ $config_name = $this->get_driver_config_name($driver);
return array(
'allow_avatar_' . $config_name => array('lang' => 'ALLOW_' . strtoupper($config_name), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
);
}
+
+ /**
+ * Get the config name of an avatar driver
+ *
+ * @param object $driver Avatar driver object
+ *
+ * @return string Avatar driver config name
+ */
+ public function get_driver_config_name($driver)
+ {
+ return preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+ }
}