aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-09-22 13:02:24 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-09-22 13:02:24 +0200
commit7e8c6d8c0d62c5b472e95c2adf8592e0ca735282 (patch)
tree8c1f5417edcbe267ddcf9cf07d860e3647f78885 /phpBB/styles
parent9454377e55e379f408f8d456fe37b4104894d899 (diff)
parenta4edb41e3f65cb5907be6513ee5066bc3c7b5413 (diff)
downloadforums-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/styles')
-rw-r--r--phpBB/styles/prosilver/template/plupload.html9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index 593070321d..9425b7d769 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -45,7 +45,14 @@ phpbb.plupload = {
max_file_size: '{FILESIZE}b',
chunk_size: '{CHUNK_SIZE}b',
unique_names: true,
- filters: [{FILTERS}],
+ filters: {
+ mime_types: [
+ {FILTERS}
+ ],
+ mime_types_max_file_size: [
+ {FILTERS}
+ ],
+ },
{S_RESIZE}
headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'},
file_data_name: 'fileupload',