Changeset 37727

Timestamp:

06/16/2016 03:38:12 PM (10 years ago)

Author:

ocean90

Message:

Media: Pass allowed file extensions to Plupload.

Plupload's mime_types filter (​http://www.plupload.com/docs/Options#filters.mime_types) allows us to inform a user about an unsupported file before the file gets uploaded.

Props polevaultweb.
Fixes #14244.

Location:

trunk/src/wp-includes

Files:

• js/plupload/handlers.js (modified) (2 diffs)
• media.php (modified) (3 diffs)

trunk/src/wp-includes/js/plupload/handlers.js

@@ -286 +286 @@
                         break;
                 case plupload.FILE_EXTENSION_ERROR:
-                        wpFileError(fileObj, pluploadL10n.invalid_filetype);
+                        wpFileExtensionError( uploader, file, pluploadL10n.invalid_filetype );
                         break;
                 case plupload.FILE_SIZE_ERROR:
@@ -337 +337 @@
                 message = pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
 
+        jQuery('#media-items').append('<div id="media-item-' + file.id + '" class="media-item error"><p>' + message + '</p></div>');
+        up.removeFile(file);
+}
+
+function wpFileExtensionError( up, file, message ) {
         jQuery('#media-items').append('<div id="media-item-' + file.id + '" class="media-item error"><p>' + message + '</p></div>');
         up.removeFile(file);

trunk/src/wp-includes/media.php

@@ -2919 +2919 @@
 
 /**
- * Prints default plupload arguments.
+ * Prints default Plupload arguments.
  *
  * @since 3.4.0
@@ -2931 +2931 @@
 
         $max_upload_size = wp_max_upload_size();
+        $allowed_extensions = array_keys( get_allowed_mime_types() );
+        $extensions = array();
+        foreach ( $allowed_extensions as $extension ) {
+                $extensions = array_merge( $extensions, explode( '|', $extension ) );
+        }
 
         $defaults = array(
@@ -2940 +2945 @@
                 'filters' => array(
                         'max_file_size'   => $max_upload_size . 'b',
+                        'mime_types'      => array( array( 'extensions' => implode( ',', $extensions ) ) ),
                 ),
         );