diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:23 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:23 +0100 |
| commit | ea6bcdff52fb3f4dc916d39e427643bc00982352 (patch) | |
| tree | 36cbf137435c31bbccad00ceb3ce03f59d553351 /phpBB/includes | |
| parent | 82b4eb6d3d9a7747f48ad3d2302d9716c37dac95 (diff) | |
| parent | 11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c (diff) | |
| download | forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar.gz forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar.bz2 forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar.xz forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.zip | |
Merge branch '3.1.x'
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 41366982d2..c9bb4bee14 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -676,9 +676,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 b0b8fb1e60..32f5ffdc44 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1919,9 +1919,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)) |