aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
-rw-r--r--phpBB/includes/acp/acp_groups.php35
1 files changed, 16 insertions, 19 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 19006df306..a15a1b9a78 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -528,27 +528,24 @@ class acp_groups
{
$avatar = $phpbb_avatar_manager->get_driver($driver);
- if ($avatar->is_enabled())
+ $avatars_enabled = true;
+ $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+ $template->set_filenames(array(
+ 'avatar' => "acp_avatar_options_$config_name.html",
+ ));
+
+ if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
{
- $avatars_enabled = true;
- $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
- $template->set_filenames(array(
- 'avatar' => "acp_avatar_options_$config_name.html",
+ $driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+ $driver_upper = strtoupper($driver_name);
+ $template->assign_block_vars('avatar_drivers', array(
+ 'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+ 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
+
+ 'DRIVER' => $driver_name,
+ 'SELECTED' => $driver == $focused_driver,
+ 'OUTPUT' => $template->assign_display('avatar'),
));
-
- if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
- {
- $driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
- $driver_upper = strtoupper($driver_name);
- $template->assign_block_vars('avatar_drivers', array(
- 'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
- 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
-
- 'DRIVER' => $driver_name,
- 'SELECTED' => $driver == $focused_driver,
- 'OUTPUT' => $template->assign_display('avatar'),
- ));
- }
}
}
}