diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-25 01:24:15 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-25 01:24:15 +0100 |
| commit | 9c3538eb0e29c491d2f8c15c44c772e29631f4e3 (patch) | |
| tree | bdbe15b863092afafbe5ad1a71f7898adaec4a22 /phpBB/includes/avatar/driver/upload.php | |
| parent | 869de98f52e636fd5b9f2a9f5b75d665e7009463 (diff) | |
| download | forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar.gz forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar.bz2 forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar.xz forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.zip | |
[feature/avatars] Move list of supported formats to avatar driver class
Using the regex and turning it into an array if necessary seemed like the
cleanest approach to achieve this.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php index 1e3c876299..ae39eb6920 100644 --- a/phpBB/includes/avatar/driver/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -66,7 +66,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext); } - $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); + $upload = new fileupload('AVATAR_', explode('|', self::REGEX_ALLOWED_EXT), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); $url = $request->variable('avatar_upload_url', ''); $upload_file = $request->file('avatar_upload_file'); |