aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-05-15 14:10:11 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-05-15 14:10:11 +0000
commitfc12c0021961f369090a3ea9fdcd62ef4d51505e (patch)
treed0e0b7b822341ee63c41bcc7eb2db823bdd0163b /phpBB/includes/functions_user.php
parent9413af5e1a59a9bfc01fb5d3896a2fb5d34055f4 (diff)
downloadforums-fc12c0021961f369090a3ea9fdcd62ef4d51505e.tar
forums-fc12c0021961f369090a3ea9fdcd62ef4d51505e.tar.gz
forums-fc12c0021961f369090a3ea9fdcd62ef4d51505e.tar.bz2
forums-fc12c0021961f369090a3ea9fdcd62ef4d51505e.tar.xz
forums-fc12c0021961f369090a3ea9fdcd62ef4d51505e.zip
And more new features for reasonable paranoia.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8555 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 e8414d2ae1..1d774a8ff4 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1952,7 +1952,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']))
{