diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:19 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:19 +0100 |
| commit | 11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c (patch) | |
| tree | e82645733df4686861c8a9367c3baa79df085c8e /phpBB/includes | |
| parent | b340e45907dc4defdbe5dcf2d75f94a6655c180d (diff) | |
| parent | b3d64b3b59234e545a75a6a7bbdda2b77cb5be84 (diff) | |
| download | forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar.gz forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar.bz2 forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar.xz forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.zip | |
Merge pull request #4105 from marc1706/ticket/14387
[ticket/14387] Allow extending avatars by extensions in ACP
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index befbcdf24a..1e0264d8e9 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -672,9 +672,8 @@ class acp_groups $driver = $phpbb_avatar_manager->get_driver($current_driver); $avatars_enabled = true; - $config_name = $phpbb_avatar_manager->get_driver_config_name($driver); $template->set_filenames(array( - 'avatar' => "acp_avatar_options_{$config_name}.html", + 'avatar' => $driver->get_acp_template_name(), )); if ($driver->prepare_form($request, $template, $user, $avatar_data, $avatar_error)) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 4d0bbf5721..aa4470fd0e 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1878,9 +1878,8 @@ class acp_users $driver = $phpbb_avatar_manager->get_driver($current_driver); $avatars_enabled = true; - $config_name = $phpbb_avatar_manager->get_driver_config_name($driver); $template->set_filenames(array( - 'avatar' => "acp_avatar_options_{$config_name}.html", + 'avatar' => $driver->get_acp_template_name(), )); if ($driver->prepare_form($request, $template, $user, $avatar_data, $error)) |