diff options
author | Henry Sudhof <kellanved@phpbb.com> | 2007-05-15 07:27:22 +0000 |
---|---|---|
committer | Henry Sudhof <kellanved@phpbb.com> | 2007-05-15 07:27:22 +0000 |
commit | f751aba4d6ffd0fa43a36ad54a5ed3cdb6a3ac9a (patch) | |
tree | a842f75797825c26bedde6ac437c85c5d1261e8e /phpBB/includes/functions_user.php | |
parent | 031f9a150531f987f9d3644039c5db6d1cc87530 (diff) | |
download | forums-f751aba4d6ffd0fa43a36ad54a5ed3cdb6a3ac9a.tar forums-f751aba4d6ffd0fa43a36ad54a5ed3cdb6a3ac9a.tar.gz forums-f751aba4d6ffd0fa43a36ad54a5ed3cdb6a3ac9a.tar.bz2 forums-f751aba4d6ffd0fa43a36ad54a5ed3cdb6a3ac9a.tar.xz forums-f751aba4d6ffd0fa43a36ad54a5ed3cdb6a3ac9a.zip |
Not really a bug, as Admins indeed have to take care of such things. However, let's assume they knew what they were doing.
#10933
git-svn-id: file:///svn/phpbb/trunk@7580 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index cd48a3d38e..d460ebdbf7 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1971,7 +1971,8 @@ function avatar_process_user(&$error, $custom_userdata = false) } } } - if ($config['avatar_max_width'] || $config['avatar_max_height']) + if (($config['avatar_max_width'] || $config['avatar_max_height']) && + (($data['width'] != $userdata['user_avatar_width']) || $data['height'] != $userdata['user_avatar_height'])) { if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) { |