aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-03-28 18:01:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-03-28 18:01:15 +0000
commitceb03a380403107da362e18e088ed0754fecfedd (patch)
treeef2461d4d858aa6c240c97433269eae4a2bafd07 /phpBB/includes/functions_user.php
parent1aed382e524261cf86f078d1e2814dc9cb7b1994 (diff)
downloadforums-ceb03a380403107da362e18e088ed0754fecfedd.tar
forums-ceb03a380403107da362e18e088ed0754fecfedd.tar.gz
forums-ceb03a380403107da362e18e088ed0754fecfedd.tar.bz2
forums-ceb03a380403107da362e18e088ed0754fecfedd.tar.xz
forums-ceb03a380403107da362e18e088ed0754fecfedd.zip
(hopefully) fixed the error display for uploading avatars (if avatar is too big)
git-svn-id: file:///svn/phpbb/trunk@5749 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6468e2f11b..0b0adbcee5 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -992,13 +992,13 @@ function avatar_remote($data, &$error)
}
else if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height'])
{
- $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_max_width'], $config['avatar_max_height']);
+ $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height']);
return false;
}
}
else if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
{
- $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_max_width'], $config['avatar_max_height']);
+ $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height']);
return false;
}