aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--phpBB/adm/style/acp_users_avatar.html2
-rw-r--r--phpBB/adm/style/avatars.js6
-rw-r--r--phpBB/includes/acp/acp_groups.php4
-rw-r--r--phpBB/includes/acp/acp_users.php4
-rw-r--r--phpBB/includes/ucp/ucp_groups.php4
-rw-r--r--phpBB/includes/ucp/ucp_profile.php4
-rw-r--r--phpBB/styles/prosilver/template/avatars.js6
-rw-r--r--phpBB/styles/subsilver2/template/avatars.js6
8 files changed, 18 insertions, 18 deletions
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index bc3a19a25e..0a72bb0b62 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -32,8 +32,8 @@
<fieldset class="quick">
<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
- </fieldset>
{S_FORM_TOKEN}
+ </fieldset>
</form>
<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
index 882bcfe36d..a53814c15f 100644
--- a/phpBB/adm/style/avatars.js
+++ b/phpBB/adm/style/avatars.js
@@ -2,14 +2,14 @@
"use strict";
-function avatar_simplify() {
+function avatar_hide() {
$('#avatar_options > div').hide();
var selected = $('#avatar_driver').val();
$('#avatar_option_' + selected).show();
}
-avatar_simplify();
-$('#avatar_driver').bind('change', avatar_simplify);
+avatar_hide();
+$('#avatar_driver').bind('change', avatar_hide);
})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 23f6d775ef..b425b9d374 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -520,7 +520,7 @@ class acp_groups
if ($config['allow_avatar'])
{
$avatars_enabled = false;
- $focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
+ $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
foreach ($avatar_drivers as $driver)
{
@@ -541,7 +541,7 @@ class acp_groups
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name,
- 'SELECTED' => $driver == $focused_driver,
+ 'SELECTED' => $driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'),
));
}
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 3df373a7d4..5c485b5996 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1801,7 +1801,7 @@ class acp_users
}
}
- $focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
+ $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
foreach ($avatar_drivers as $current_driver)
{
@@ -1823,7 +1823,7 @@ class acp_users
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name,
- 'SELECTED' => $current_driver == $focused_driver,
+ 'SELECTED' => $current_driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'),
));
}
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index c1ddaccb75..262e7b238f 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -646,7 +646,7 @@ class ucp_groups
if ($config['allow_avatar'])
{
$avatars_enabled = false;
- $focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
+ $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
foreach ($avatar_drivers as $current_driver)
{
@@ -666,7 +666,7 @@ class ucp_groups
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name,
- 'SELECTED' => $current_driver == $focused_driver,
+ 'SELECTED' => $current_driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'),
));
}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index ecd828c6dc..7b4dddf12b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -625,7 +625,7 @@ class ucp_profile
}
}
- $focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
+ $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
foreach ($avatar_drivers as $current_driver)
{
@@ -646,7 +646,7 @@ class ucp_profile
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name,
- 'SELECTED' => $current_driver == $focused_driver,
+ 'SELECTED' => $current_driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'),
));
}
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
index 882bcfe36d..a53814c15f 100644
--- a/phpBB/styles/prosilver/template/avatars.js
+++ b/phpBB/styles/prosilver/template/avatars.js
@@ -2,14 +2,14 @@
"use strict";
-function avatar_simplify() {
+function avatar_hide() {
$('#avatar_options > div').hide();
var selected = $('#avatar_driver').val();
$('#avatar_option_' + selected).show();
}
-avatar_simplify();
-$('#avatar_driver').bind('change', avatar_simplify);
+avatar_hide();
+$('#avatar_driver').bind('change', avatar_hide);
})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js
index df6aad178a..733056a32d 100644
--- a/phpBB/styles/subsilver2/template/avatars.js
+++ b/phpBB/styles/subsilver2/template/avatars.js
@@ -2,14 +2,14 @@
"use strict";
-function avatar_simplify() {
+function avatar_hide() {
$('.[class^="avatar_option_"]').hide();
var selected = $('#avatar_driver').val();
$('.avatar_option_' + selected).show();
}
-avatar_simplify();
-$('#avatar_driver').bind('change', avatar_simplify);
+avatar_hide();
+$('#avatar_driver').bind('change', avatar_hide);
})(jQuery); // Avoid conflicts with other libraries
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-21 19:56:18 +0000