aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-11-30 21:03:29 +0100
committerJoas Schilling <nickvergessen@gmx.de>2011-11-30 21:03:29 +0100
commitb790d2e2839850c053b6fecc4f5d767746c47f20 (patch)
tree7125e0c1b89776cc83c3d9347fb04edc125435f1 /phpBB/includes/acp
parent[ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes (diff)
downloadphpbb-b790d2e2839850c053b6fecc4f5d767746c47f20.tar.gz
phpbb-b790d2e2839850c053b6fecc4f5d767746c47f20.tar.bz2
phpbb-b790d2e2839850c053b6fecc4f5d767746c47f20.zip
[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
PHPBB3-10345
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_groups.php6
-rw-r--r--phpBB/includes/acp/acp_users.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index ea4d5f35cb..98b0e4dc56 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -371,7 +371,7 @@ class acp_groups
{
if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
{
- $error[] = avatar_error_wrong_size($data['width'], $data['height']);
+ $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
}
}
@@ -381,7 +381,7 @@ class acp_groups
{
if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height'])
{
- $error[] = avatar_error_wrong_size($data['width'], $data['height']);
+ $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
}
}
}
@@ -627,7 +627,7 @@ class acp_groups
'U_BACK' => $u_back,
'U_SWATCH' => append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=settings&amp;name=group_colour'),
'U_ACTION' => "{$this->u_action}&amp;action=$action&amp;g=$group_id",
- 'L_AVATAR_EXPLAIN' => avatar_explanation_string(),
+ 'L_AVATAR_EXPLAIN' => phpbb_avatar_explanation_string(),
));
return;
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index a41fd3d17a..c1ad28ca14 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1748,7 +1748,7 @@ class acp_users
'USER_AVATAR_WIDTH' => $user_row['user_avatar_width'],
'USER_AVATAR_HEIGHT' => $user_row['user_avatar_height'],
- 'L_AVATAR_EXPLAIN' => avatar_explanation_string()
+ 'L_AVATAR_EXPLAIN' => phpbb_avatar_explanation_string(),
));
break;