WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `.dfxp` and `.srt` files to mime-type whitelist in `wp_get_mime_types()`. They are both captioning formats supported by MediaElement. 

Props joedolson.
Fixes #27643.


Built from https://develop.svn.wordpress.org/trunk@28259


git-svn-id: http://core.svn.wordpress.org/trunk@28087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-05 20:08:16 +00:00
parent 511145b418
commit b663fffe24
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/functions.php
View File

@ -145,7 +145,7 @@ function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
* Filter the date formatted based on the locale. * Filter the date formatted based on the locale.
* *
* @since 2.8.0 * @since 2.8.0
* *
* @param string $j Formatted date string. * @param string $j Formatted date string.
* @param string $req_format Format to display the date. * @param string $req_format Format to display the date.
* @param int $i Unix timestamp. * @param int $i Unix timestamp.
@ -2095,7 +2095,7 @@ function wp_get_mime_types() {
'webm' => 'video/webm', 'webm' => 'video/webm',
'mkv' => 'video/x-matroska', 'mkv' => 'video/x-matroska',
// Text formats // Text formats
'txt|asc|c|cc|h' => 'text/plain', 'txt|asc|c|cc|h|srt' => 'text/plain',
'csv' => 'text/csv', 'csv' => 'text/csv',
'tsv' => 'text/tab-separated-values', 'tsv' => 'text/tab-separated-values',
'ics' => 'text/calendar', 'ics' => 'text/calendar',
@ -2103,6 +2103,7 @@ function wp_get_mime_types() {
'css' => 'text/css', 'css' => 'text/css',
'htm|html' => 'text/html', 'htm|html' => 'text/html',
'vtt' => 'text/vtt', 'vtt' => 'text/vtt',
'dfxp' => 'application/ttaf+xml',
// Audio formats // Audio formats
'mp3|m4a|m4b' => 'audio/mpeg', 'mp3|m4a|m4b' => 'audio/mpeg',
'ra|ram' => 'audio/x-realaudio', 'ra|ram' => 'audio/x-realaudio',
@ -4121,8 +4122,8 @@ function wp_allowed_protocols() {
/** /**
* Filter the list of protocols allowed in HTML attributes. * Filter the list of protocols allowed in HTML attributes.
* *
* @since 3.0.0 * @since 3.0.0
* *
* @param array $protocols Array of allowed protocols e.g. 'http', 'ftp', 'tel', and more. * @param array $protocols Array of allowed protocols e.g. 'http', 'ftp', 'tel', and more.
*/ */