Skip to content

Commit f8d3824

Browse files
author
Boris van Katwijk
committed
feat(extensions): add .webp .svg .mp3. remove .flv (flash).
A combination of the following issue's/pr's: #22 #26 #19
1 parent 0086687 commit f8d3824

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

Helper/Settings.php

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,32 @@ public function getExtraFiletypes()
105105
}
106106
}
107107

108-
$defaultFiletypes = ['doc', 'docm', 'docx', 'odt', 'csv', 'xml', 'xls', 'xlsx', 'ods', 'pdf', 'zip', 'tar'];
108+
$defaultFiletypes = [
109+
'jpg',
110+
'jpeg',
111+
'png',
112+
'gif',
113+
'webp',
114+
'svg',
115+
'pdf',
116+
'doc',
117+
'docx',
118+
'docm',
119+
'odt',
120+
'csv',
121+
'txt',
122+
'xml',
123+
'xls',
124+
'xlsx',
125+
'ods',
126+
'zip',
127+
'tar',
128+
'mp3',
129+
'mp4',
130+
'ogg',
131+
'webm',
132+
];
133+
109134
return array_merge($filetypes, $defaultFiletypes);
110135
}
111136
}

etc/adminhtml/di.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<item name="jpeg" xsi:type="string">image/jpeg</item>
1212
<item name="png" xsi:type="string">image/png</item>
1313
<item name="gif" xsi:type="string">image/gif</item>
14+
<item name="webp" xsi:type="string">image/webp</item>
15+
<item name="svg" xsi:type="string">image/svg+xml</item>
1416
<item name="pdf" xsi:type="string">application/pdf</item>
1517
<item name="doc" xsi:type="string">application/msword</item>
1618
<item name="docx" xsi:type="string">application/vnd.openxmlformats-officedocument.wordprocessingml.document</item>
@@ -24,6 +26,7 @@
2426
<item name="ods" xsi:type="string">application/vnd.oasis.opendocument.spreadsheet</item>
2527
<item name="zip" xsi:type="string">application/zip</item>
2628
<item name="tar" xsi:type="string">application/x-tar</item>
29+
<item name="mp3" xsi:type="string">audio/mpeg</item>
2730
<item name="mp4" xsi:type="string">video/mp4</item>
2831
<item name="ogg" xsi:type="string">video/ogg</item>
2932
<item name="webm" xsi:type="string">video/webm</item>
@@ -33,6 +36,8 @@
3336
<item name="jpeg" xsi:type="string">image/jpeg</item>
3437
<item name="png" xsi:type="string">image/png</item>
3538
<item name="gif" xsi:type="string">image/gif</item>
39+
<item name="webp" xsi:type="string">image/webp</item>
40+
<item name="svg" xsi:type="string">image/svg+xml</item>
3641
<item name="pdf" xsi:type="string">application/pdf</item>
3742
<item name="doc" xsi:type="string">application/msword</item>
3843
<item name="docx" xsi:type="string">application/vnd.openxmlformats-officedocument.wordprocessingml.document</item>
@@ -46,12 +51,12 @@
4651
<item name="ods" xsi:type="string">application/vnd.oasis.opendocument.spreadsheet</item>
4752
<item name="zip" xsi:type="string">application/zip</item>
4853
<item name="tar" xsi:type="string">application/x-tar</item>
54+
<item name="mp3" xsi:type="string">audio/mpeg</item>
4955
<item name="mp4" xsi:type="string">video/mp4</item>
5056
<item name="ogg" xsi:type="string">video/ogg</item>
5157
<item name="webm" xsi:type="string">video/webm</item>
5258
</item>
5359
<item name="media_allowed" xsi:type="array">
54-
<item name="flv" xsi:type="string">video/x-flv</item>
5560
<item name="swf" xsi:type="string">application/x-shockwave-flash</item>
5661
<item name="avi" xsi:type="string">video/x-msvideo</item>
5762
<item name="mov" xsi:type="string">video/x-sgi-movie</item>

0 commit comments

Comments
 (0)