Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 02:10:45 +01:00
Code Issues Projects Releases Wiki Activity

Media: Add aac to the list of allowed file types.

Browse Source 
Props desrosj.
Merges [42697] and [43135] to the 4.9 branch.
Fixes #42919.
Built from https://develop.svn.wordpress.org/branches/4.9@43136


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-03 06:42:25 +00:00
parent 95c9ca4091
commit 5247520fe2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/functions.php
View File

@ -2446,6 +2446,7 @@ function wp_get_mime_types() {
'dfxp' => 'application/ttaf+xml', 'dfxp' => 'application/ttaf+xml',
// Audio formats. // Audio formats.
'mp3|m4a|m4b' => 'audio/mpeg', 'mp3|m4a|m4b' => 'audio/mpeg',
'aac' => 'audio/aac',
'ra|ram' => 'audio/x-realaudio', 'ra|ram' => 'audio/x-realaudio',
'wav' => 'audio/wav', 'wav' => 'audio/wav',
'ogg|oga' => 'audio/ogg', 'ogg|oga' => 'audio/ogg',

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.6-alpha-43134'; $wp_version = '4.9.6-alpha-43136';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.