Ticket #33713: big-fix.33713.diff

src/wp-admin/js/customize-controls.js

@@ -1734 +1734 @@
                                 ]
                         });
 
+                        //If the library mime type is set to image, we should do the same for uploads
+                        if ( this.params.mime_type == 'image' ) {
+                                this.frame.uploader.options.uploader.filter = this.params.mime_type;
+                        }
+                        
                         // When a file is selected, run a callback.
                         this.frame.on( 'select', this.select );
                 },
@@ -2373 +2378 @@
                                 ]
                         });
 
+                        //Since the library mime type is set to image, we should do the same for uploads
+                        this.frame.uploader.options.uploader.filter = 'image';
+                
+
                         this.frame.on('select', this.onSelect, this);
                         this.frame.on('cropped', this.onCropped, this);
                         this.frame.on('skippedcrop', this.onSkippedCrop, this);

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

@@ -32 +32 @@
                                 browser:   'browse_button',
                                 dropzone:  'drop_element'
                         },
-                        key, error;
+                        filter, key, error;
 
                 this.supports = {
                         upload: Uploader.browser.supported
@@ -49 +49 @@
                 this.plupload = $.extend( true, { multipart_params: {} }, Uploader.defaults );
                 this.container = document.body; // Set default container.
 
+                //Restrict what file types can be uploaded. Taking a string of extensions 'jpg,gif,png'
+                //If filter is set to 'image' we'll convert to correct extensions
+                this.filter = options.filter;
+                if ( this.filter == 'image' ) {
+                        this.filter = 'jpeg,jpg,gif,png,svg,webp';
+                }
+
+                if ( this.filter ) {
+                        this.plupload.filters.mime_types = [ { extensions: this.filter } ];
+                }
+
                 // Extend the instance with options.
                 //
                 // Use deep extend to allow options.plupload to override individual