diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:43:04 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-10 23:43:04 +0100 |
| commit | eff1d378ccb6e80b6011267c9ce73ab0a316522a (patch) | |
| tree | 62e49167e90340eca0e8c082af37a9ff326eefee /phpBB/includes/functions_user.php | |
| parent | 5ea59ba3222965c824284a7f0d0648bbe12a7bec (diff) | |
| parent | c9b9016ca8fb83d57d7bfaeb9cc9772a722fa458 (diff) | |
| download | forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar.gz forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar.bz2 forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.tar.xz forums-eff1d378ccb6e80b6011267c9ce73ab0a316522a.zip | |
Merge branch 'develop-olympus' into develop
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 b99393d24a..317578cd54 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'])) { |