aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/avatar/driver/upload.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-02-06 23:47:14 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-02-07 00:08:53 +0100
commit5a4da46f9bdadbd1744f78b39c68184b317df60b (patch)
tree18c52dcba67cfe1955b1cf61bc893d80401ffa3a /phpBB/includes/avatar/driver/upload.php
parentc56db535b4f0c943777ab159c14729d724f5d232 (diff)
downloadforums-5a4da46f9bdadbd1744f78b39c68184b317df60b.tar
forums-5a4da46f9bdadbd1744f78b39c68184b317df60b.tar.gz
forums-5a4da46f9bdadbd1744f78b39c68184b317df60b.tar.bz2
forums-5a4da46f9bdadbd1744f78b39c68184b317df60b.tar.xz
forums-5a4da46f9bdadbd1744f78b39c68184b317df60b.zip
[feature/avatars] Use array for allowed extensions and implode if needed
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
-rw-r--r--phpBB/includes/avatar/driver/upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 282e0a21ff..56569ec63c 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_', 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));
+ $upload = new fileupload('AVATAR_', $this->allowed_extensions, $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');