aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-05-28 13:05:45 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-05-28 13:05:45 +0000
commit91b4fe1868ca2c4d81111943f781e3cfd0262ef2 (patch)
tree3c41b59d9938c5fa5e06b7b1c2d2b95b33437e3f /phpBB/includes/functions_user.php
parent28e8c3ea8587f7dc2d37068a92ebd9d0dfc230c6 (diff)
downloadforums-91b4fe1868ca2c4d81111943f781e3cfd0262ef2.tar
forums-91b4fe1868ca2c4d81111943f781e3cfd0262ef2.tar.gz
forums-91b4fe1868ca2c4d81111943f781e3cfd0262ef2.tar.bz2
forums-91b4fe1868ca2c4d81111943f781e3cfd0262ef2.tar.xz
forums-91b4fe1868ca2c4d81111943f781e3cfd0262ef2.zip
Merging mime and referer checks into the Trunk
git-svn-id: file:///svn/phpbb/trunk@8571 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 40dc87b2e1..8519cd4fa6 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1881,7 +1881,7 @@ function avatar_upload($data, &$error)
// Init upload class
include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
- $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height']);
+ $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], explode('|', $config['mime_triggers']));
if (!empty($_FILES['uploadfile']['name']))
{