aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_groups.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-11-25 00:54:34 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-11-25 00:54:34 +0100
commitce44e3908eef5166e5e3e43d2642c5372379b6a6 (patch)
tree3d517a28b448a42bd3b782a35aff75e55f6152ac /phpBB/includes/ucp/ucp_groups.php
parent2b917199066cb06aa9c6c846ce06252d6f8036e9 (diff)
downloadforums-ce44e3908eef5166e5e3e43d2642c5372379b6a6.tar
forums-ce44e3908eef5166e5e3e43d2642c5372379b6a6.tar.gz
forums-ce44e3908eef5166e5e3e43d2642c5372379b6a6.tar.bz2
forums-ce44e3908eef5166e5e3e43d2642c5372379b6a6.tar.xz
forums-ce44e3908eef5166e5e3e43d2642c5372379b6a6.zip
[feature/avatars] Remove unnecessary abbreviations
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
-rw-r--r--phpBB/includes/ucp/ucp_groups.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 1d469814b6..2a388d17f8 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -522,8 +522,8 @@ class ucp_groups
// Handle avatar
$driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver);
- $av_delete = $request->variable('av_delete', '');
- if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
+ $avatar_delete = $request->variable('avatar_delete', '');
+ if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{
$avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $avatar_error);
@@ -666,14 +666,14 @@ class ucp_groups
if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
{
- $driver_n = str_replace('.', '_', $driver);
- $driver_u = strtoupper($driver_n);
+ $driver_name = str_replace('.', '_', $driver);
+ $driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array(
- 'L_TITLE' => $user->lang($driver_u . '_TITLE'),
- 'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
+ 'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+ 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
- 'DRIVER' => $driver_n,
- 'SELECTED' => ($driver == $focused_driver),
+ 'DRIVER' => $driver_name,
+ 'SELECTED' => $driver == $focused_driver,
'OUTPUT' => $template->assign_display('avatar'),
));
}