diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-06 23:47:14 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:08:53 +0100 |
| commit | 5a4da46f9bdadbd1744f78b39c68184b317df60b (patch) | |
| tree | 18c52dcba67cfe1955b1cf61bc893d80401ffa3a /phpBB/includes/avatar/driver/local.php | |
| parent | c56db535b4f0c943777ab159c14729d724f5d232 (diff) | |
| download | forums-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/local.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/local.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php index a789cd391d..9049cadea8 100644 --- a/phpBB/includes/avatar/driver/local.php +++ b/phpBB/includes/avatar/driver/local.php @@ -162,7 +162,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver $image = $file_info->getFilename(); // Match all images in the gallery folder - if (preg_match('#^[^&\'"<>]+\.(?:'. self::REGEX_ALLOWED_EXT . ')$#i', $image) && is_file($file_path . '/' . $image)) + if (preg_match('#^[^&\'"<>]+\.(?:' . implode('|', $this->allowed_extensions) . ')$#i', $image) && is_file($file_path . '/' . $image)) { if (function_exists('getimagesize')) { |