diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-22 13:02:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-22 13:02:24 +0200 |
| commit | 7e8c6d8c0d62c5b472e95c2adf8592e0ca735282 (patch) | |
| tree | 8c1f5417edcbe267ddcf9cf07d860e3647f78885 /phpBB/phpbb | |
| parent | 9454377e55e379f408f8d456fe37b4104894d899 (diff) | |
| parent | a4edb41e3f65cb5907be6513ee5066bc3c7b5413 (diff) | |
| download | forums-7e8c6d8c0d62c5b472e95c2adf8592e0ca735282.tar forums-7e8c6d8c0d62c5b472e95c2adf8592e0ca735282.tar.gz forums-7e8c6d8c0d62c5b472e95c2adf8592e0ca735282.tar.bz2 forums-7e8c6d8c0d62c5b472e95c2adf8592e0ca735282.tar.xz forums-7e8c6d8c0d62c5b472e95c2adf8592e0ca735282.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index eb698fb35d..9ad12b1082 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -216,38 +216,36 @@ class plupload } /** - * Looks at the list of allowed extensions and generates a string - * appropriate for use in configuring plupload with - * - * @param \phpbb\cache\service $cache - * @param string $forum_id The ID of the forum - * - * @return string - */ + * Looks at the list of allowed extensions and generates a string + * appropriate for use in configuring plupload with + * + * @param \phpbb\cache\service $cache Cache service object + * @param string $forum_id The forum identifier + * + * @return string + */ public function generate_filter_string(\phpbb\cache\service $cache, $forum_id) { + $groups = []; + $filters = []; + $attach_extensions = $cache->obtain_attach_extensions($forum_id); unset($attach_extensions['_allowed_']); - $groups = array(); // Re-arrange the extension array to $groups[$group_name][] foreach ($attach_extensions as $extension => $extension_info) { - if (!isset($groups[$extension_info['group_name']])) - { - $groups[$extension_info['group_name']] = array(); - } - - $groups[$extension_info['group_name']][] = $extension; + $groups[$extension_info['group_name']]['extensions'][] = $extension; + $groups[$extension_info['group_name']]['max_file_size'] = (int) $extension_info['max_filesize']; } - $filters = array(); - foreach ($groups as $group => $extensions) + foreach ($groups as $group => $group_info) { $filters[] = sprintf( - "{title: '%s', extensions: '%s'}", + "{title: '%s', extensions: '%s', max_file_size: %s}", addslashes(ucfirst(strtolower($group))), - addslashes(implode(',', $extensions)) + addslashes(implode(',', $group_info['extensions'])), + $group_info['max_file_size'] ); } |