Changeset 42452 for branches/4.9

Timestamp:

01/15/2018 10:23:24 PM (7 years ago)

Author:

SergeyBiryukov

Message:

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

Props blobfolio.
Merges [42451] to the 4.9 branch.
Fixes #42225.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (2 diffs)
• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (1 diff)

branches/4.9/src/wp-includes/functions.php

@@ -2450 +2450 @@
     'wav' => 'audio/wav',
     'ogg|oga' => 'audio/ogg',
+    'flac' => 'audio/flac',
     'mid|midi' => 'audio/midi',
     'wma' => 'audio/x-ms-wma',
@@ -2535 +2536 @@
     return apply_filters( 'ext2type', array(
         'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
-        'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
+        'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'flac', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
         'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
         'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),

branches/4.9/src/wp-includes/media.php

@@ -2158 +2158 @@
      *
      * @param array $extensions An array of support audio formats. Defaults are
-     *                          'mp3', 'ogg', 'm4a', 'wav'.
-     */
-    return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'm4a', 'wav' ) );
+     *                          'mp3', 'ogg', 'flac', 'm4a', 'wav'.
+     */
+    return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'flac', 'm4a', 'wav' ) );
 }
 

branches/4.9/tests/phpunit/tests/functions.php

@@ -1156 +1156 @@
                     ),
                 ),
+                // FLAC file.
+                array(
+                    DIR_TESTDATA . '/uploads/small-audio.flac',
+                    'small-audio.flac',
+                    array(
+                        'ext' => 'flac',
+                        'type' => 'audio/flac',
+                        'proper_filename' => false,
+                    ),
+                ),
             ) );
         }