diff options
author | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:42:41 +0100 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:42:41 +0100 |
commit | c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458 (patch) | |
tree | 0067ffed98002d41ad42d5328ca7dea990f69be2 /phpBB/includes/functions_user.php | |
parent | d7299f5071d461e6bf77df8c96b19bcd1bf027db (diff) | |
parent | ac26bb458f2a2ea60848921826c69bfe03e676db (diff) | |
download | forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar.gz forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar.bz2 forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.tar.xz forums-c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458.zip |
Merge branch 'ticket/bantu/9764' into develop-olympus
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index f2c80705ba..90341cd926 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2080,7 +2080,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'], explode('|', $config['mime_triggers'])); + $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'], (isset($config['mime_triggers']) ? explode('|', $config['mime_triggers']) : false)); if (!empty($_FILES['uploadfile']['name'])) { |