Changeset 45934

Timestamp:

09/04/2019 01:10:57 AM (7 years ago)

Author:

azaozz

Message:

Uploads: After an image is uploaded and PHP times out or runs out of memory during post-processing (the server response is HTTP 500 error), try to resize it three more times. Then, if all attempts fail, do a cleanup of any sub-sizes that may have been created and show an error message asking the user to scale the image and upload it again.

See #47872.

Location:

trunk/src

Files:

• js/_enqueues/vendor/plupload/handlers.js (modified) (15 diffs)
• js/_enqueues/vendor/plupload/wp-plupload.js (modified) (12 diffs)
• js/media/views/uploader/status.js (modified) (1 diff)
• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (99 diffs)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (114 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/vendor/plupload/handlers.js

@@ -3 +3 @@
 
 // progress and success handlers for media multi uploads
-function fileQueued(fileObj) {
+function fileQueued( fileObj ) {
         // Get rid of unused form
-        jQuery('.media-blank').remove();
-
-        var items = jQuery('#media-items').children(), postid = post_id || 0;
+        jQuery( '.media-blank' ).remove();
+
+        var items = jQuery( '#media-items' ).children(), postid = post_id || 0;
 
         // Collapse a single item
         if ( items.length == 1 ) {
-                items.removeClass('open').find('.slidetoggle').slideUp(200);
+                items.removeClass( 'open' ).find( '.slidetoggle' ).slideUp( 200 );
         }
         // Create a progress bar containing the filename
-        jQuery('<div class="media-item">')
+        jQuery( '<div class="media-item">' )
                 .attr( 'id', 'media-item-' + fileObj.id )
-                .addClass('child-of-' + postid)
-                .append('<div class="progress"><div class="percent">0%</div><div class="bar"></div></div>',
-                        jQuery('<div class="filename original">').text( ' ' + fileObj.name ))
-                .appendTo( jQuery('#media-items' ) );
+                .addClass( 'child-of-' + postid )
+                .append( '<div class="progress"><div class="percent">0%</div><div class="bar"></div></div>',
+                        jQuery( '<div class="filename original">' ).text( ' ' + fileObj.name ) )
+                .appendTo( jQuery( '#media-items' ) );
 
         // Disable submit
-        jQuery('#insert-gallery').prop('disabled', true);
+        jQuery( '#insert-gallery' ).prop( 'disabled', true );
 }
 
@@ -28 +28 @@
         try {
                 if ( typeof topWin.tb_remove != 'undefined' )
-                        topWin.jQuery('#TB_overlay').unbind('click', topWin.tb_remove);
-        } catch(e){}
+                        topWin.jQuery( '#TB_overlay' ).unbind( 'click', topWin.tb_remove );
+        } catch( e ){}
 
         return true;
 }
 
-function uploadProgress(up, file) {
-        var item = jQuery('#media-item-' + file.id);
-
-        jQuery('.bar', item).width( (200 * file.loaded) / file.size );
-        jQuery('.percent', item).html( file.percent + '%' );
+function uploadProgress( up, file ) {
+        var item = jQuery( '#media-item-' + file.id );
+
+        jQuery( '.bar', item ).width( ( 200 * file.loaded ) / file.size );
+        jQuery( '.percent', item ).html( file.percent + '%' );
 }
 
@@ -59 +59 @@
 
 function updateMediaForm() {
-        var items = jQuery('#media-items').children();
+        var items = jQuery( '#media-items' ).children();
 
         // Just one file, no need for collapsible part
         if ( items.length == 1 ) {
-                items.addClass('open').find('.slidetoggle').show();
-                jQuery('.insert-gallery').hide();
+                items.addClass( 'open' ).find( '.slidetoggle' ).show();
+                jQuery( '.insert-gallery' ).hide();
         } else if ( items.length > 1 ) {
-                items.removeClass('open');
+                items.removeClass( 'open' );
                 // Only show Gallery/Playlist buttons when there are at least two files.
-                jQuery('.insert-gallery').show();
+                jQuery( '.insert-gallery' ).show();
         }
 
         // Only show Save buttons when there is at least one file.
-        if ( items.not('.media-blank').length > 0 )
-                jQuery('.savebutton').show();
+        if ( items.not( '.media-blank' ).length > 0 )
+                jQuery( '.savebutton' ).show();
         else
-                jQuery('.savebutton').hide();
-}
-
-function uploadSuccess(fileObj, serverData) {
-        var item = jQuery('#media-item-' + fileObj.id);
+                jQuery( '.savebutton' ).hide();
+}
+
+function uploadSuccess( fileObj, serverData ) {
+        var item = jQuery( '#media-item-' + fileObj.id );
 
         // on success serverData should be numeric, fix bug in html4 runtime returning the serverData wrapped in a <pre> tag
-        serverData = serverData.replace(/^<pre>(\d+)<\/pre>$/, '$1');
-
-        // if async-upload returned an error message, place it in the media item div and return
-        if ( serverData.match(/media-upload-error|error-div/) ) {
-                item.html(serverData);
-                return;
-        } else {
-                jQuery('.percent', item).html( pluploadL10n.crunching );
-        }
-
-        prepareMediaItem(fileObj, serverData);
+        if ( typeof serverData === 'string' ) {
+                serverData = serverData.replace( /^<pre>(\d+)<\/pre>$/, '$1' );
+
+                // if async-upload returned an error message, place it in the media item div and return
+                if ( /media-upload-error|error-div/.test( serverData ) ) {
+                        item.html( serverData );
+                        return;
+                }
+        }
+
+        item.find( '.percent' ).html( pluploadL10n.crunching );
+
+        prepareMediaItem( fileObj, serverData );
         updateMediaForm();
 
         // Increment the counter.
-        if ( post_id && item.hasClass('child-of-' + post_id) )
-                jQuery('#attachments-count').text(1 * jQuery('#attachments-count').text() + 1);
+        if ( post_id && item.hasClass( 'child-of-' + post_id ) ) {
+                jQuery( '#attachments-count' ).text( 1 * jQuery( '#attachments-count' ).text() + 1 );
+        }
 }
 
@@ -117 +120 @@
 }
 
-function prepareMediaItem(fileObj, serverData) {
-        var f = ( typeof shortform == 'undefined' ) ? 1 : 2, item = jQuery('#media-item-' + fileObj.id);
+function prepareMediaItem( fileObj, serverData ) {
+        var f = ( typeof shortform == 'undefined' ) ? 1 : 2, item = jQuery( '#media-item-' + fileObj.id );
         if ( f == 2 && shortform > 2 )
                 f = shortform;
@@ -124 +127 @@
         try {
                 if ( typeof topWin.tb_remove != 'undefined' )
-                        topWin.jQuery('#TB_overlay').click(topWin.tb_remove);
-        } catch(e){}
-
-        if ( isNaN(serverData) || !serverData ) { // Old style: Append the HTML returned by the server -- thumbnail and form inputs
-                item.append(serverData);
-                prepareMediaItemInit(fileObj);
+                        topWin.jQuery( '#TB_overlay' ).click( topWin.tb_remove );
+        } catch( e ){}
+
+        if ( isNaN( serverData ) || !serverData ) { // Old style: Append the HTML returned by the server -- thumbnail and form inputs
+                item.append( serverData );
+                prepareMediaItemInit( fileObj );
         } else { // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
-                item.load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm();});
-        }
-}
-
-function prepareMediaItemInit(fileObj) {
-        var item = jQuery('#media-item-' + fileObj.id);
+                item.load( 'async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit( fileObj );updateMediaForm();});
+        }
+}
+
+function prepareMediaItemInit( fileObj ) {
+        var item = jQuery( '#media-item-' + fileObj.id );
         // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename
-        jQuery('.thumbnail', item).clone().attr('class', 'pinkynail toggle').prependTo(item);
+        jQuery( '.thumbnail', item ).clone().attr( 'class', 'pinkynail toggle' ).prependTo( item );
 
         // Replace the original filename with the new (unique) one assigned during upload
-        jQuery('.filename.original', item).replaceWith( jQuery('.filename.new', item) );
+        jQuery( '.filename.original', item ).replaceWith( jQuery( '.filename.new', item ) );
 
         // Bind AJAX to the new Delete button
-        jQuery('a.delete', item).click(function(){
+        jQuery( 'a.delete', item ).click( function(){
                 // Tell the server to delete it. TODO: handle exceptions
                 jQuery.ajax({
@@ -153 +156 @@
                         id: fileObj.id,
                         data: {
-                                id : this.id.replace(/[^0-9]/g, ''),
+                                id : this.id.replace(/[^0-9]/g, '' ),
                                 action : 'trash-post',
-                                _ajax_nonce : this.href.replace(/^.*wpnonce=/,'')
+                                _ajax_nonce : this.href.replace(/^.*wpnonce=/,'' )
                         }
                 });
@@ -162 +165 @@
 
         // Bind AJAX to the new Undo button
-        jQuery('a.undo', item).click(function(){
+        jQuery( 'a.undo', item ).click( function(){
                 // Tell the server to untrash it. TODO: handle exceptions
                 jQuery.ajax({
@@ -169 +172 @@
                         id: fileObj.id,
                         data: {
-                                id : this.id.replace(/[^0-9]/g,''),
+                                id : this.id.replace(/[^0-9]/g,'' ),
                                 action: 'untrash-post',
-                                _ajax_nonce: this.href.replace(/^.*wpnonce=/,'')
+                                _ajax_nonce: this.href.replace(/^.*wpnonce=/,'' )
                         },
                         success: function( ){
                                 var type,
-                                        item = jQuery('#media-item-' + fileObj.id);
-
-                                if ( type = jQuery('#type-of-' + fileObj.id).val() )
-                                        jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-0+1);
-
-                                if ( post_id && item.hasClass('child-of-'+post_id) )
-                                        jQuery('#attachments-count').text(jQuery('#attachments-count').text()-0+1);
-
-                                jQuery('.filename .trashnotice', item).remove();
-                                jQuery('.filename .title', item).css('font-weight','normal');
-                                jQuery('a.undo', item).addClass('hidden');
-                                jQuery('.menu_order_input', item).show();
-                                item.css( {backgroundColor:'#ceb'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 500, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('undo');
+                                        item = jQuery( '#media-item-' + fileObj.id );
+
+                                if ( type = jQuery( '#type-of-' + fileObj.id ).val() )
+                                        jQuery( '#' + type + '-counter' ).text( jQuery( '#' + type + '-counter' ).text()-0+1 );
+
+                                if ( post_id && item.hasClass( 'child-of-'+post_id ) )
+                                        jQuery( '#attachments-count' ).text( jQuery( '#attachments-count' ).text()-0+1 );
+
+                                jQuery( '.filename .trashnotice', item ).remove();
+                                jQuery( '.filename .title', item ).css( 'font-weight','normal' );
+                                jQuery( 'a.undo', item ).addClass( 'hidden' );
+                                jQuery( '.menu_order_input', item ).show();
+                                item.css( {backgroundColor:'#ceb'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 500, complete: function(){ jQuery( this ).css({backgroundColor:''}); } }).removeClass( 'undo' );
                         }
                 });
@@ -194 +197 @@
 
         // Open this item if it says to start open (e.g. to display an error)
-        jQuery('#media-item-' + fileObj.id + '.startopen').removeClass('startopen').addClass('open').find('slidetoggle').fadeIn();
+        jQuery( '#media-item-' + fileObj.id + '.startopen' ).removeClass( 'startopen' ).addClass( 'open' ).find( 'slidetoggle' ).fadeIn();
 }
 
 // generic error message
-function wpQueueError(message) {
-        jQuery('#media-upload-error').show().html( '<div class="error"><p>' + message + '</p></div>' );
+function wpQueueError( message ) {
+        jQuery( '#media-upload-error' ).show().html( '<div class="error"><p>' + message + '</p></div>' );
 }
 
 // file-specific error messages
-function wpFileError(fileObj, message) {
-        itemAjaxError(fileObj.id, message);
-}
-
-function itemAjaxError(id, message) {
-        var item = jQuery('#media-item-' + id), filename = item.find('.filename').text(), last_err = item.data('last-err');
+function wpFileError( fileObj, message ) {
+        itemAjaxError( fileObj.id, message );
+}
+
+function itemAjaxError( id, message ) {
+        var item = jQuery( '#media-item-' + id ), filename = item.find( '.filename' ).text(), last_err = item.data( 'last-err' );
 
         if ( last_err == id ) // prevent firing an error for the same file twice
                 return;
 
-        item.html('<div class="error-div">' +
+        item.html( '<div class="error-div">' +
                                 '<a class="dismiss" href="#">' + pluploadL10n.dismiss + '</a>' +
-                                '<strong>' + pluploadL10n.error_uploading.replace('%s', jQuery.trim(filename)) + '</strong> ' +
+                                '<strong>' + pluploadL10n.error_uploading.replace( '%s', jQuery.trim( filename )) + '</strong> ' +
                                 message +
-                                '</div>').data('last-err', id);
-}
-
-function deleteSuccess(data) {
+                                '</div>' ).data( 'last-err', id );
+}
+
+function deleteSuccess( data ) {
         var type, id, item;
         if ( data == '-1' )
-                return itemAjaxError(this.id, 'You do not have permission. Has your session expired?');
+                return itemAjaxError( this.id, 'You do not have permission. Has your session expired?' );
 
         if ( data == '0' )
-                return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?');
+                return itemAjaxError( this.id, 'Could not be deleted. Has it been deleted already?' );
 
         id = this.id;
-        item = jQuery('#media-item-' + id);
+        item = jQuery( '#media-item-' + id );
 
         // Decrement the counters.
-        if ( type = jQuery('#type-of-' + id).val() )
-                jQuery('#' + type + '-counter').text( jQuery('#' + type + '-counter').text() - 1 );
-
-        if ( post_id && item.hasClass('child-of-'+post_id) )
-                jQuery('#attachments-count').text( jQuery('#attachments-count').text() - 1 );
-
-        if ( jQuery('form.type-form #media-items').children().length == 1 && jQuery('.hidden', '#media-items').length > 0 ) {
-                jQuery('.toggle').toggle();
-                jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
+        if ( type = jQuery( '#type-of-' + id ).val() )
+                jQuery( '#' + type + '-counter' ).text( jQuery( '#' + type + '-counter' ).text() - 1 );
+
+        if ( post_id && item.hasClass( 'child-of-'+post_id ) )
+                jQuery( '#attachments-count' ).text( jQuery( '#attachments-count' ).text() - 1 );
+
+        if ( jQuery( 'form.type-form #media-items' ).children().length == 1 && jQuery( '.hidden', '#media-items' ).length > 0 ) {
+                jQuery( '.toggle' ).toggle();
+                jQuery( '.slidetoggle' ).slideUp( 200 ).siblings().removeClass( 'hidden' );
         }
 
         // Vanish it.
-        jQuery('.toggle', item).toggle();
-        jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
-        item.css( {backgroundColor:'#faa'} ).animate( {backgroundColor:'#f4f4f4'}, {queue:false, duration:500} ).addClass('undo');
-
-        jQuery('.filename:empty', item).remove();
-        jQuery('.filename .title', item).css('font-weight','bold');
-        jQuery('.filename', item).append('<span class="trashnotice"> ' + pluploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
-        jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
-        jQuery('.menu_order_input', item).hide();
+        jQuery( '.toggle', item ).toggle();
+        jQuery( '.slidetoggle', item ).slideUp( 200 ).siblings().removeClass( 'hidden' );
+        item.css( {backgroundColor:'#faa'} ).animate( {backgroundColor:'#f4f4f4'}, {queue:false, duration:500} ).addClass( 'undo' );
+
+        jQuery( '.filename:empty', item ).remove();
+        jQuery( '.filename .title', item ).css( 'font-weight','bold' );
+        jQuery( '.filename', item ).append( '<span class="trashnotice"> ' + pluploadL10n.deleted + ' </span>' ).siblings( 'a.toggle' ).hide();
+        jQuery( '.filename', item ).append( jQuery( 'a.undo', item ).removeClass( 'hidden' ) );
+        jQuery( '.menu_order_input', item ).hide();
 
         return;
@@ -258 +261 @@
 
 function deleteError() {
-        // TODO
 }
 
 function uploadComplete() {
-        jQuery('#insert-gallery').prop('disabled', false);
-}
-
-function switchUploader(s) {
+        jQuery( '#insert-gallery' ).prop( 'disabled', false );
+}
+
+function switchUploader( s ) {
         if ( s ) {
-                deleteUserSetting('uploader');
-                jQuery('.media-upload-form').removeClass('html-uploader');
-
-                if ( typeof(uploader) == 'object' )
+                deleteUserSetting( 'uploader' );
+                jQuery( '.media-upload-form' ).removeClass( 'html-uploader' );
+
+                if ( typeof( uploader ) == 'object' )
                         uploader.refresh();
         } else {
-                setUserSetting('uploader', '1'); // 1 == html uploader
-                jQuery('.media-upload-form').addClass('html-uploader');
-        }
-}
-
-function uploadError(fileObj, errorCode, message, uploader) {
+                setUserSetting( 'uploader', '1' ); // 1 == html uploader
+                jQuery( '.media-upload-form' ).addClass( 'html-uploader' );
+        }
+}
+
+function uploadError( fileObj, errorCode, message, up ) {
         var hundredmb = 100 * 1024 * 1024, max;
 
-        switch (errorCode) {
+        switch ( errorCode ) {
                 case plupload.FAILED:
-                        wpFileError(fileObj, pluploadL10n.upload_failed);
+                        wpFileError( fileObj, pluploadL10n.upload_failed );
                         break;
                 case plupload.FILE_EXTENSION_ERROR:
-                        wpFileExtensionError( uploader, fileObj, pluploadL10n.invalid_filetype );
+                        wpFileExtensionError( up, fileObj, pluploadL10n.invalid_filetype );
                         break;
                 case plupload.FILE_SIZE_ERROR:
-                        uploadSizeError(uploader, fileObj);
+                        uploadSizeError( up, fileObj );
                         break;
                 case plupload.IMAGE_FORMAT_ERROR:
-                        wpFileError(fileObj, pluploadL10n.not_an_image);
+                        wpFileError( fileObj, pluploadL10n.not_an_image );
                         break;
                 case plupload.IMAGE_MEMORY_ERROR:
-                        wpFileError(fileObj, pluploadL10n.image_memory_exceeded);
+                        wpFileError( fileObj, pluploadL10n.image_memory_exceeded );
                         break;
                 case plupload.IMAGE_DIMENSIONS_ERROR:
-                        wpFileError(fileObj, pluploadL10n.image_dimensions_exceeded);
+                        wpFileError( fileObj, pluploadL10n.image_dimensions_exceeded );
                         break;
                 case plupload.GENERIC_ERROR:
-                        wpQueueError(pluploadL10n.upload_failed);
+                        wpQueueError( pluploadL10n.upload_failed );
                         break;
                 case plupload.IO_ERROR:
-                        max = parseInt( uploader.settings.filters.max_file_size, 10 );
-
-                        if ( max > hundredmb && fileObj.size > hundredmb )
-                                wpFileError( fileObj, pluploadL10n.big_upload_failed.replace('%1$s', '<a class="uploader-html" href="#">').replace('%2$s', '</a>') );
-                        else
-                                wpQueueError(pluploadL10n.io_error);
+                        max = parseInt( up.settings.filters.max_file_size, 10 );
+
+                        if ( max > hundredmb && fileObj.size > hundredmb ) {
+                                wpFileError( fileObj, pluploadL10n.big_upload_failed.replace( '%1$s', '<a class="uploader-html" href="#">' ).replace( '%2$s', '</a>' ) );
+                        } else {
+                                wpQueueError( pluploadL10n.io_error );
+                        }
+
                         break;
                 case plupload.HTTP_ERROR:
-                        wpQueueError(pluploadL10n.http_error);
+                        wpQueueError( pluploadL10n.http_error );
                         break;
                 case plupload.INIT_ERROR:
-                        jQuery('.media-upload-form').addClass('html-uploader');
+                        jQuery( '.media-upload-form' ).addClass( 'html-uploader' );
                         break;
                 case plupload.SECURITY_ERROR:
-                        wpQueueError(pluploadL10n.security_error);
+                        wpQueueError( pluploadL10n.security_error );
                         break;
 /*              case plupload.UPLOAD_ERROR.UPLOAD_STOPPED:
                 case plupload.UPLOAD_ERROR.FILE_CANCELLED:
-                        jQuery('#media-item-' + fileObj.id).remove();
+                        jQuery( '#media-item-' + fileObj.id ).remove();
                         break;*/
                 default:
-                        wpFileError(fileObj, pluploadL10n.default_error);
+                        wpFileError( fileObj, pluploadL10n.default_error );
         }
 }
@@ -332 +336 @@
         var message, errorDiv;
 
-        message = pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
+        message = pluploadL10n.file_exceeds_size_limit.replace( '%s', file.name );
 
         // Construct the error div.
@@ -346 +350 @@
 
         // Append the error.
-        jQuery('#media-items').append( errorDiv );
-        up.removeFile(file);
+        jQuery( '#media-items' ).append( errorDiv );
+        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);
-}
-
-jQuery(document).ready(function($){
-        $('.media-upload-form').bind('click.uploader', function(e) {
-                var target = $(e.target), tr, c;
-
-                if ( target.is('input[type="radio"]') ) { // remember the last used image size and alignment
-                        tr = target.closest('tr');
-
-                        if ( tr.hasClass('align') )
-                                setUserSetting('align', target.val());
-                        else if ( tr.hasClass('image-size') )
-                                setUserSetting('imgsize', target.val());
-
-                } else if ( target.is('button.button') ) { // remember the last used image link url
+        jQuery( '#media-items' ).append( '<div id="media-item-' + file.id + '" class="media-item error"><p>' + message + '</p></div>' );
+        up.removeFile( file );
+}
+
+jQuery( document ).ready( function( $ ) {
+        var tryAgainCount = {};
+        var tryAgain;
+
+        $( '.media-upload-form' ).bind( 'click.uploader', function( e ) {
+                var target = $( e.target ), tr, c;
+
+                if ( target.is( 'input[type="radio"]' ) ) { // remember the last used image size and alignment
+                        tr = target.closest( 'tr' );
+
+                        if ( tr.hasClass( 'align' ) )
+                                setUserSetting( 'align', target.val() );
+                        else if ( tr.hasClass( 'image-size' ) )
+                                setUserSetting( 'imgsize', target.val() );
+
+                } else if ( target.is( 'button.button' ) ) { // remember the last used image link url
                         c = e.target.className || '';
-                        c = c.match(/url([^ '"]+)/);
+                        c = c.match( /url([^ '"]+)/ );
 
                         if ( c && c[1] ) {
-                                setUserSetting('urlbutton', c[1]);
-                                target.siblings('.urlfield').val( target.data('link-url') );
-                        }
-                } else if ( target.is('a.dismiss') ) {
-                        target.parents('.media-item').fadeOut(200, function(){
-                                $(this).remove();
-                        });
-                } else if ( target.is('.upload-flash-bypass a') || target.is('a.uploader-html') ) { // switch uploader to html4
-                        $('#media-items, p.submit, span.big-file-warning').css('display', 'none');
-                        switchUploader(0);
+                                setUserSetting( 'urlbutton', c[1] );
+                                target.siblings( '.urlfield' ).val( target.data( 'link-url' ) );
+                        }
+                } else if ( target.is( 'a.dismiss' ) ) {
+                        target.parents( '.media-item' ).fadeOut( 200, function() {
+                                $( this ).remove();
+                        } );
+                } else if ( target.is( '.upload-flash-bypass a' ) || target.is( 'a.uploader-html' ) ) { // switch uploader to html4
+                        $( '#media-items, p.submit, span.big-file-warning' ).css( 'display', 'none' );
+                        switchUploader( 0 );
                         e.preventDefault();
-                } else if ( target.is('.upload-html-bypass a') ) { // switch uploader to multi-file
-                        $('#media-items, p.submit, span.big-file-warning').css('display', '');
-                        switchUploader(1);
+                } else if ( target.is( '.upload-html-bypass a' ) ) { // switch uploader to multi-file
+                        $( '#media-items, p.submit, span.big-file-warning' ).css( 'display', '' );
+                        switchUploader( 1 );
                         e.preventDefault();
-                } else if ( target.is('a.describe-toggle-on') ) { // Show
-                        target.parent().addClass('open');
-                        target.siblings('.slidetoggle').fadeIn(250, function(){
-                                var S = $(window).scrollTop(), H = $(window).height(), top = $(this).offset().top, h = $(this).height(), b, B;
+                } else if ( target.is( 'a.describe-toggle-on' ) ) { // Show
+                        target.parent().addClass( 'open' );
+                        target.siblings( '.slidetoggle' ).fadeIn( 250, function() {
+                                var S = $( window ).scrollTop(),
+                                        H = $( window ).height(),
+                                        top = $( this ).offset().top,
+                                        h = $( this ).height(),
+                                        b,
+                                        B;
 
                                 if ( H && top && h ) {
@@ -398 +410 @@
                                         if ( b > B ) {
                                                 if ( b - B < top - S )
-                                                        window.scrollBy(0, (b - B) + 10);
+                                                        window.scrollBy( 0, ( b - B ) + 10 );
                                                 else
-                                                        window.scrollBy(0, top - S - 40);
+                                                        window.scrollBy( 0, top - S - 40 );
                                         }
                                 }
-                        });
+                        } );
+
                         e.preventDefault();
-                } else if ( target.is('a.describe-toggle-off') ) { // Hide
-                        target.siblings('.slidetoggle').fadeOut(250, function(){
-                                target.parent().removeClass('open');
-                        });
+                } else if ( target.is( 'a.describe-toggle-off' ) ) { // Hide
+                        target.siblings( '.slidetoggle' ).fadeOut( 250, function() {
+                                target.parent().removeClass( 'open' );
+                        } );
+
                         e.preventDefault();
                 }
         });
 
+        // Attempt to create image sub-sizes when an image was uploaded successfully
+        // but the server responded with HTTP 500 error.
+        tryAgain = function( up, error ) {
+                var file = error.file;
+                var times;
+
+                if ( ! file || ! file.id ) {
+                        wpQueueError( error.message || pluploadL10n.default_error );
+                        return;
+                }
+
+                times = tryAgainCount[ file.id ];
+
+                if ( times && times > 4 ) {
+                        // The file may have been uploaded and attachment post created,
+                        // but post-processing and resizing failed...
+                        // Do a cleanup then tell the user to scale down the image and upload it again.
+                        $.ajax({
+                                type: 'post',
+                                url: ajaxurl,
+                                dataType: 'json',
+                                data: {
+                                        action: 'media-create-image-subsizes',
+                                        _wpnonce: _wpPluploadSettings.defaults.multipart_params._wpnonce,
+                                        _wp_temp_image_ref: file.id,
+                                        _wp_upload_failed_cleanup: true,
+                                }
+                        });
+
+                        if ( error.message && error.status !== 500 ) {
+                                wpQueueError( error.message );
+                        } else {
+                                wpQueueError( pluploadL10n.http_error_image );
+                        }
+
+                        return;
+                }
+
+                if ( ! times ) {
+                        tryAgainCount[ file.id ] = 1;
+                } else {
+                        tryAgainCount[ file.id ] = ++times;
+                }
+
+                // Try to create the missing image sizes.
+                $.ajax({
+                        type: 'post',
+                        url: ajaxurl,
+                        dataType: 'json',
+                        data: {
+                                action: 'media-create-image-subsizes',
+                                _wpnonce: wpUploaderInit.multipart_params._wpnonce,
+                                _wp_temp_image_ref: file.id,
+                                _legasy_support: 'true',
+                        }
+                }).done( function( response ) {
+                        var message;
+
+                        if ( response.success ) {
+                                uploadSuccess( file, response.data.id );
+                        } else {
+                                if ( response.data && response.data.message ) {
+                                        message = response.data.message;
+                                }
+
+                                wpQueueError( message || pluploadL10n.http_error_image );
+                        }
+                }).fail( function( jqXHR ) {
+                        // If another HTTP 500 error, try try again...
+                        if ( jqXHR.status === 500 ) {
+                                tryAgain( up, error );
+                                return;
+                        }
+
+                        wpQueueError( pluploadL10n.http_error_image );
+                });
+        }
+
         // init and set the uploader
         uploader_init = function() {
-                var isIE = navigator.userAgent.indexOf('Trident/') != -1 || navigator.userAgent.indexOf('MSIE ') != -1;
-
-                // Make sure flash sends cookies (seems in IE it does whitout switching to urlstream mode)
-                if ( ! isIE && 'flash' === plupload.predictRuntime( wpUploaderInit ) &&
-                        ( ! wpUploaderInit.required_features || ! wpUploaderInit.required_features.hasOwnProperty( 'send_binary_string' ) ) ) {
-
-                        wpUploaderInit.required_features = wpUploaderInit.required_features || {};
-                        wpUploaderInit.required_features.send_binary_string = true;
-                }
-
-                uploader = new plupload.Uploader(wpUploaderInit);
-
-                $('#image_resize').bind('change', function() {
-                        var arg = $(this).prop('checked');
+                uploader = new plupload.Uploader( wpUploaderInit );
+
+                $( '#image_resize' ).bind( 'change', function() {
+                        var arg = $( this ).prop( 'checked' );
 
                         setResize( arg );
 
                         if ( arg )
-                                setUserSetting('upload_resize', '1');
+                                setUserSetting( 'upload_resize', '1' );
                         else
-                                deleteUserSetting('upload_resize');
-                });
-
-                uploader.bind('Init', function(up) {
-                        var uploaddiv = $('#plupload-upload-ui');
-
-                        setResize( getUserSetting('upload_resize', false) );
-
-                        if ( up.features.dragdrop && ! $(document.body).hasClass('mobile') ) {
-                                uploaddiv.addClass('drag-drop');
-                                $('#drag-drop-area').on('dragover.wp-uploader', function(){ // dragenter doesn't fire right :(
-                                        uploaddiv.addClass('drag-over');
-                                }).on('dragleave.wp-uploader, drop.wp-uploader', function(){
-                                        uploaddiv.removeClass('drag-over');
+                                deleteUserSetting( 'upload_resize' );
+                });
+
+                uploader.bind( 'Init', function( up ) {
+                        var uploaddiv = $( '#plupload-upload-ui' );
+
+                        setResize( getUserSetting( 'upload_resize', false ) );
+
+                        if ( up.features.dragdrop && ! $( document.body ).hasClass( 'mobile' ) ) {
+                                uploaddiv.addClass( 'drag-drop' );
+
+                                $( '#drag-drop-area' ).on( 'dragover.wp-uploader', function() { // dragenter doesn't fire right :(
+                                        uploaddiv.addClass( 'drag-over' );
+                                }).on( 'dragleave.wp-uploader, drop.wp-uploader', function() {
+                                        uploaddiv.removeClass( 'drag-over' );
                                 });
                         } else {
-                                uploaddiv.removeClass('drag-drop');
-                                $('#drag-drop-area').off('.wp-uploader');
+                                uploaddiv.removeClass( 'drag-drop' );
+                                $( '#drag-drop-area' ).off( '.wp-uploader' );
                         }
 
                         if ( up.runtime === 'html4' ) {
-                                $('.upload-flash-bypass').hide();
+                                $( '.upload-flash-bypass' ).hide();
                         }
                 });
@@ -466 +549 @@
                 uploader.init();
 
-                uploader.bind('FilesAdded', function( up, files ) {
-                        $('#media-upload-error').empty();
+                uploader.bind( 'FilesAdded', function( up, files ) {
+                        $( '#media-upload-error' ).empty();
                         uploadStart();
 
@@ -478 +561 @@
                 });
 
-                uploader.bind('UploadFile', function(up, file) {
-                        fileUploading(up, file);
-                });
-
-                uploader.bind('UploadProgress', function(up, file) {
-                        uploadProgress(up, file);
-                });
-
-                uploader.bind('Error', function(up, err) {
-                        uploadError(err.file, err.code, err.message, up);
+                uploader.bind( 'UploadFile', function( up, file ) {
+                        fileUploading( up, file );
+                });
+
+                uploader.bind( 'UploadProgress', function( up, file ) {
+                        uploadProgress( up, file );
+                });
+
+                uploader.bind( 'Error', function( up, error ) {
+                        var isImage = error.file && error.file.type && error.file.type.indexOf( 'image/' ) === 0;
+                        var status  = error && error.status;
+
+                        // If the file is an image and the error is HTTP 500 try to create sub-sizes again.
+                        if ( status === 500 && isImage ) {
+                                tryAgain( up, error );
+                                return;
+                        }
+
+                        uploadError( error.file, error.code, error.message, up );
                         up.refresh();
                 });
 
-                uploader.bind('FileUploaded', function(up, file, response) {
-                        uploadSuccess(file, response.response);
-                });
-
-                uploader.bind('UploadComplete', function() {
+                uploader.bind( 'FileUploaded', function( up, file, response ) {
+                        uploadSuccess( file, response.response );
+                });
+
+                uploader.bind( 'UploadComplete', function() {
                         uploadComplete();
                 });
+
+                /**
+                 * When uploading images add a file reference used to retrieve the attachment_id
+                 * if the uploading fails due to a server timeout of out of memoty (HTTP 500) error.
+                 *
+                 * @param {plupload.Uploader} up   Uploader instance.
+                 * @param {plupload.File}     file File for uploading.
+                 */
+                uploader.bind( 'BeforeUpload', function( up, file ) {
+                        if ( file.type && file.type.indexOf( 'image/' ) === 0 ) {
+                                up.settings.multipart_params._wp_temp_image_ref = file.id;
+                        } else {
+                                unset( up.settings.multipart_params._wp_temp_image_ref );
+                        }
+                } );
         };
 
-        if ( typeof(wpUploaderInit) == 'object' ) {
+        if ( typeof( wpUploaderInit ) == 'object' ) {
                 uploader_init();
         }

trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js

@@ -34 +34 @@
         Uploader = function( options ) {
                 var self = this,
-                        isIE = navigator.userAgent.indexOf('Trident/') != -1 || navigator.userAgent.indexOf('MSIE ') != -1,
+                        isIE, // not used, back-compat
                         elements = {
                                 container: 'container',
@@ -40 +40 @@
                                 dropzone:  'drop_element'
                         },
-                        key, error;
+                        tryAgainCount = {},
+                        tryAgain,
+                        key,
+                        error,
+                        fileUploaded;
 
                 this.supports = {
@@ -96 +100 @@
                 }
 
-                // Make sure flash sends cookies (seems in IE it does without switching to urlstream mode)
-                if ( ! isIE && 'flash' === plupload.predictRuntime( this.plupload ) &&
-                        ( ! this.plupload.required_features || ! this.plupload.required_features.hasOwnProperty( 'send_binary_string' ) ) ) {
-
-                        this.plupload.required_features = this.plupload.required_features || {};
-                        this.plupload.required_features.send_binary_string = true;
-                }
-
                 // Initialize the plupload instance.
                 this.uploader = new plupload.Uploader( this.plupload );
@@ -113 +109 @@
 
                 /**
+                 * Attempt to create image sub-sizes when an image was uploaded successfully
+                 * but the server responded with HTTP 500 error.
+                 *
+                 * @since 5.3.0
+                 *
+                 * @param  {string}        message  Error message.
+                 * @param  {object}        data     Error data from Plupload.
+                 * @param  {plupload.File} file     File that was uploaded.
+                 */
+                tryAgain = function( message, data, file ) {
+                        var times;
+
+                        if ( ! file || ! file.id ) {
+                                error( pluploadL10n.upload_failed, data, file, 'no-retry' );
+                                return;
+                        }
+
+                        times = tryAgainCount[ file.id ];
+
+                        if ( times && times > 4 ) {
+                                // The file may have been uploaded and attachment post created,
+                                // but post-processing and resizing failed...
+                                // Do a cleanup then tell the user to scale down the image and upload it again.
+                                $.ajax({
+                                        type: 'post',
+                                        url: ajaxurl,
+                                        dataType: 'json',
+                                        data: {
+                                                action: 'media-create-image-subsizes',
+                                                _wpnonce: _wpPluploadSettings.defaults.multipart_params._wpnonce,
+                                                _wp_temp_image_ref: file.id,
+                                                _wp_upload_failed_cleanup: true,
+                                        }
+                                });
+
+                                error( message, data, file, 'no-retry' );
+                                return;
+                        }
+
+                        if ( ! times ) {
+                                tryAgainCount[ file.id ] = 1;
+                        } else {
+                                tryAgainCount[ file.id ] = ++times;
+                        }
+
+                        // Another request to try to create the missing image sub-sizes.
+                        $.ajax({
+                                type: 'post',
+                                url: ajaxurl,
+                                dataType: 'json',
+                                data: {
+                                        action: 'media-create-image-subsizes',
+                                        _wpnonce: _wpPluploadSettings.defaults.multipart_params._wpnonce,
+                                        _wp_temp_image_ref: file.id, // Used to find the new attachment_id.
+                                }
+                        }).done( function( response ) {
+                                if ( response.success ) {
+                                        fileUploaded( self.uploader, file, response );
+                                } else {
+                                        if ( response.data && response.data.message ) {
+                                                message = response.data.message;
+                                        }
+
+                                        error( message, data, file, 'no-retry' );
+                                }
+                        }).fail( function( jqXHR ) {
+                                // If another HTTP 500 error, try try again...
+                                if ( jqXHR.status === 500 ) {
+                                        tryAgain( message, data, file );
+                                        return;
+                                }
+
+                                error( message, data, file, 'no-retry' );
+                        });
+                }
+
+                /**
                  * Custom error callback.
                  *
@@ -118 +191 @@
                  * and display errors. @see wp.Uploader.errors.
                  *
-                 * @param  {string}        message
-                 * @param  {object}        data
+                 * @param  {string}        message  Error message.
+                 * @param  {object}        data     Error data from Plupload.
                  * @param  {plupload.File} file     File that was uploaded.
-                 */
-                error = function( message, data, file ) {
+                 * @param  {string}        retry    Whether to try again to create image sub-sizes. Passing 'no-retry' will prevent it.
+                 */
+                error = function( message, data, file, retry ) {
+                        var isImage = file.type && file.type.indexOf( 'image/' ) === 0;
+                        var status  = data && data.status;
+
+                        // If the file is an image and the error is HTTP 500 try to create sub-sizes again.
+                        if ( retry !== 'no-retry' && status === 500 && isImage ) {
+                                tryAgain( message, data, file );
+                                return;
+                        }
+
                         if ( file.attachment ) {
                                 file.attachment.destroy();
@@ -135 +218 @@
                         self.error( message, data, file );
                 };
+
+                /**
+                 * After a file is successfully uploaded, update its model.
+                 *
+                 * @param {plupload.Uploader} up       Uploader instance.
+                 * @param {plupload.File}     file     File that was uploaded.
+                 * @param {Object}            response Object with response properties.
+                 */
+                fileUploaded = function( up, file, response ) {
+                        var complete;
+
+                        // Remove the "uploading" UI elements
+                        _.each( ['file','loaded','size','percent'], function( key ) {
+                                file.attachment.unset( key );
+                        } );
+
+                        file.attachment.set( _.extend( response.data, { uploading: false } ) );
+
+                        wp.media.model.Attachment.get( response.data.id, file.attachment );
+
+                        complete = Uploader.queue.all( function( attachment ) {
+                                return ! attachment.get( 'uploading' );
+                        });
+
+                        if ( complete ) {
+                                Uploader.queue.reset();
+                        }
+
+                        self.success( file.attachment );
+                }
 
                 /**
@@ -204 +317 @@
 
                 /**
+                 * When uploading images add a reference used to retrieve the attachment_id.
+                 * Used if the uploading fails due to a server timeout of out of memoty error (HTTP 500).
+                 *
+                 * @param {plupload.Uploader} up   Uploader instance.
+                 * @param {plupload.File}     file File for uploading.
+                 */
+                this.uploader.bind( 'BeforeUpload', function( up, file ) {
+                        if ( file.type && file.type.indexOf( 'image/' ) === 0 ) {
+                                up.settings.multipart_params._wp_temp_image_ref = file.id;
+                        } else {
+                                unset( up.settings.multipart_params._wp_temp_image_ref );
+                        }
+                } );
+
+                /**
                  * After files were filtered and added to the queue, create a model for each.
                  *
-                 * @param {plupload.Uploader} uploader Uploader instance.
-                 * @param {Array}             files    Array of file objects that were added to queue by the user.
+                 * @param {plupload.Uploader} up    Uploader instance.
+                 * @param {Array}             files Array of file objects that were added to queue by the user.
                  */
                 this.uploader.bind( 'FilesAdded', function( up, files ) {
@@ -260 +388 @@
                  * After a file is successfully uploaded, update its model.
                  *
-                 * @param {plupload.Uploader} uploader Uploader instance.
+                 * @param {plupload.Uploader} up       Uploader instance.
                  * @param {plupload.File}     file     File that was uploaded.
                  * @param {Object}            response Object with response properties.
@@ -266 +394 @@
                  */
                 this.uploader.bind( 'FileUploaded', function( up, file, response ) {
-                        var complete;
 
                         try {
@@ -274 +401 @@
                         }
 
-                        if ( ! _.isObject( response ) || _.isUndefined( response.success ) )
+                        if ( ! _.isObject( response ) || _.isUndefined( response.success ) ) {
                                 return error( pluploadL10n.default_error, null, file );
-                        else if ( ! response.success )
+                        } else if ( ! response.success ) {
                                 return error( response.data && response.data.message, response.data, file );
-
-                        _.each(['file','loaded','size','percent'], function( key ) {
-                                file.attachment.unset( key );
-                        });
-
-                        file.attachment.set( _.extend( response.data, { uploading: false }) );
-                        wp.media.model.Attachment.get( response.data.id, file.attachment );
-
-                        complete = Uploader.queue.all( function( attachment ) {
-                                return ! attachment.get('uploading');
-                        });
-
-                        if ( complete )
-                                Uploader.queue.reset();
-
-                        self.success( file.attachment );
+                        }
+
+                        // Success. Update the UI with the new attachment.
+                        fileUploaded( up, file, response );
                 });
 
@@ -299 +414 @@
                  * When plupload surfaces an error, send it to the error handler.
                  *
-                 * @param {plupload.Uploader} uploader Uploader instance.
-                 * @param {Object}            error    Contains code, message and sometimes file and other details.
+                 * @param {plupload.Uploader} up            Uploader instance.
+                 * @param {Object}            pluploadError Contains code, message and sometimes file and other details.
                  */
                 this.uploader.bind( 'Error', function( up, pluploadError ) {
@@ -339 +454 @@
                 'GENERIC_ERROR':          pluploadL10n.upload_failed,
                 'IO_ERROR':               pluploadL10n.io_error,
-                'HTTP_ERROR':             pluploadL10n.http_error,
                 'SECURITY_ERROR':         pluploadL10n.security_error,
 
                 'FILE_SIZE_ERROR': function( file ) {
-                        return pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
-                }
+                        return pluploadL10n.file_exceeds_size_limit.replace( '%s', file.name );
+                },
+
+                'HTTP_ERROR': function( file ) {
+                        if ( file.type && file.type.indexOf( 'image/' ) === 0 ) {
+                                return pluploadL10n.http_error_image;
+                        }
+
+                        return pluploadL10n.http_error;
+                },
         };
 

trunk/src/js/media/views/uploader/status.js

@@ -112 +112 @@
          */
         error: function( error ) {
-                this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
-                        filename: this.filename( error.get('file').name ),
-                        message:  error.get('message')
-                }), { at: 0 });
+                var statusError = new wp.media.view.UploaderStatusError( {
+                        filename: this.filename( error.get( 'file' ).name ),
+                        message:  error.get( 'message' )
+                } );
+
+                // Can show additional info here while retrying to create image sub-sizes.
+                this.views.add( '.upload-errors', statusError, { at: 0 } );
         },
 

trunk/src/wp-admin/admin-ajax.php

@@ -106 +106 @@
         'send-attachment-to-editor',
         'save-attachment-order',
+        'media-create-image-subsizes',
         'heartbeat',
         'get-revision-diffs',

trunk/src/wp-admin/includes/ajax-actions.php

@@ -112 +112 @@
         $taxonomy = sanitize_key( $_GET['tax'] );
         $tax      = get_taxonomy( $taxonomy );
+
         if ( ! $tax ) {
                 wp_die( 0 );
@@ -126 +127 @@
                 $s = str_replace( $comma, ',', $s );
         }
+
         if ( false !== strpos( $s, ',' ) ) {
                 $s = explode( ',', $s );
                 $s = $s[ count( $s ) - 1 ];
         }
+
         $s = trim( $s );
 
@@ -194 +197 @@
                                 wp_die( -1 );
                         }
+
                         if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) {
                                 header( 'Content-Encoding: deflate' );
@@ -203 +207 @@
                                 wp_die( -1 );
                         }
+
                         echo $out;
                         wp_die();
@@ -231 +236 @@
 
         include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
+
         if ( ! stream_preview_image( $post_id ) ) {
                 wp_die( -1 );
@@ -296 +302 @@
                 )
         ) : array() );
+
         $exclude_blog_users = ( $type == 'add' ? get_users(
                 array(
@@ -482 +489 @@
                 $status = 'all';
                 $parsed = parse_url( $url );
+
                 if ( isset( $parsed['query'] ) ) {
                         parse_str( $parsed['query'], $query_vars );
+
                         if ( ! empty( $query_vars['comment_status'] ) ) {
                                 $status = $query_vars['comment_status'];
                         }
+
                         if ( ! empty( $query_vars['p'] ) ) {
                                 $post_id = (int) $query_vars['p'];
                         }
+
                         if ( ! empty( $query_vars['comment_type'] ) ) {
                                 $type = $query_vars['comment_type'];
@@ -551 +562 @@
         $taxonomy = get_taxonomy( substr( $action, 4 ) );
         check_ajax_referer( $action, '_ajax_nonce-add-' . $taxonomy->name );
+
         if ( ! current_user_can( $taxonomy->cap->edit_terms ) ) {
                 wp_die( -1 );
         }
+
         $names  = explode( ',', $_POST[ 'new' . $taxonomy->name ] );
         $parent = isset( $_POST[ 'new' . $taxonomy->name . '_parent' ] ) ? (int) $_POST[ 'new' . $taxonomy->name . '_parent' ] : 0;
+
         if ( 0 > $parent ) {
                 $parent = 0;
         }
+
         if ( $taxonomy->name == 'category' ) {
                 $post_category = isset( $_POST['post_category'] ) ? (array) $_POST['post_category'] : array();
@@ -564 +579 @@
                 $post_category = ( isset( $_POST['tax_input'] ) && isset( $_POST['tax_input'][ $taxonomy->name ] ) ) ? (array) $_POST['tax_input'][ $taxonomy->name ] : array();
         }
+
         $checked_categories = array_map( 'absint', (array) $post_category );
         $popular_ids        = wp_popular_terms_checklist( $taxonomy->name, 0, 10, false );
@@ -570 +586 @@
                 $cat_name          = trim( $cat_name );
                 $category_nicename = sanitize_title( $cat_name );
+
                 if ( '' === $category_nicename ) {
                         continue;
@@ -575 +592 @@
 
                 $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+
                 if ( ! $cat_id || is_wp_error( $cat_id ) ) {
                         continue;
@@ -580 +598 @@
                         $cat_id = $cat_id['term_id'];
                 }
+
                 $checked_categories[] = $cat_id;
+
                 if ( $parent ) { // Do these all at once in a second
                         continue;
@@ -671 +691 @@
 
         $comment = get_comment( $id );
+
         if ( ! $comment ) {
                 wp_die( time() );
         }
+
         if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
                 wp_die( -1 );
@@ -680 +702 @@
         check_ajax_referer( "delete-comment_$id" );
         $status = wp_get_comment_status( $comment );
-
-        $delta = -1;
+        $delta  = -1;
+
         if ( isset( $_POST['trash'] ) && 1 == $_POST['trash'] ) {
                 if ( 'trash' == $status ) {
                         wp_die( time() );
                 }
+
                 $r = wp_trash_comment( $comment );
         } elseif ( isset( $_POST['untrash'] ) && 1 == $_POST['untrash'] ) {
@@ -691 +714 @@
                         wp_die( time() );
                 }
+
                 $r = wp_untrash_comment( $comment );
+
                 if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) { // undo trash, not in trash
                         $delta = 1;
@@ -699 +724 @@
                         wp_die( time() );
                 }
+
                 $r = wp_spam_comment( $comment );
         } elseif ( isset( $_POST['unspam'] ) && 1 == $_POST['unspam'] ) {
@@ -704 +730 @@
                         wp_die( time() );
                 }
+
                 $r = wp_unspam_comment( $comment );
+
                 if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) { // undo spam, not in spam
                         $delta = 1;
@@ -717 +745 @@
                 _wp_ajax_delete_comment_response( $comment->comment_ID, $delta );
         }
+
         wp_die( 0 );
 }
@@ -735 +764 @@
         $taxonomy = ! empty( $_POST['taxonomy'] ) ? $_POST['taxonomy'] : 'post_tag';
         $tag      = get_term( $tag_id, $taxonomy );
+
         if ( ! $tag || is_wp_error( $tag ) ) {
                 wp_die( 1 );
@@ -755 +785 @@
 
         check_ajax_referer( "delete-bookmark_$id" );
+
         if ( ! current_user_can( 'manage_links' ) ) {
                 wp_die( -1 );
@@ -781 +812 @@
         check_ajax_referer( "delete-meta_$id" );
         $meta = get_metadata_by_mid( 'post', $id );
+
         if ( ! $meta ) {
                 wp_die( 1 );
@@ -788 +820 @@
                 wp_die( -1 );
         }
+
         if ( delete_meta( $meta->meta_id ) ) {
                 wp_die( 1 );
         }
+
         wp_die( 0 );
 }
@@ -805 +839 @@
                 $action = 'delete-post';
         }
+
         $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
-
         check_ajax_referer( "{$action}_$id" );
+
         if ( ! current_user_can( 'delete_post', $id ) ) {
                 wp_die( -1 );
@@ -834 +869 @@
                 $action = 'trash-post';
         }
+
         $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
-
         check_ajax_referer( "{$action}_$id" );
+
         if ( ! current_user_can( 'delete_post', $id ) ) {
                 wp_die( -1 );
@@ -869 +905 @@
                 $action = 'untrash-post';
         }
+
         wp_ajax_trash_post( $action );
 }
@@ -883 +920 @@
                 $action = 'delete-page';
         }
+
         $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
-
         check_ajax_referer( "{$action}_$id" );
+
         if ( ! current_user_can( 'delete_page', $id ) ) {
                 wp_die( -1 );
@@ -907 +945 @@
  */
 function wp_ajax_dim_comment() {
-        $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
-
+        $id      = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
         $comment = get_comment( $id );
+
         if ( ! $comment ) {
                 $x = new WP_Ajax_Response(
@@ -929 +967 @@
 
         $current = wp_get_comment_status( $comment );
+
         if ( isset( $_POST['new'] ) && $_POST['new'] == $current ) {
                 wp_die( time() );
@@ -934 +973 @@
 
         check_ajax_referer( "approve-comment_$id" );
+
         if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
                 $result = wp_set_comment_status( $comment, 'approve', true );
@@ -966 +1006 @@
                 $action = 'add-link-category';
         }
+
         check_ajax_referer( $action );
         $tax = get_taxonomy( 'link_category' );
+
         if ( ! current_user_can( $tax->cap->manage_terms ) ) {
                 wp_die( -1 );
         }
+
         $names = explode( ',', wp_unslash( $_POST['newcat'] ) );
         $x     = new WP_Ajax_Response();
+
         foreach ( $names as $cat_name ) {
                 $cat_name = trim( $cat_name );
                 $slug     = sanitize_title( $cat_name );
+
                 if ( '' === $slug ) {
                         continue;
@@ -981 +1026 @@
 
                 $cat_id = wp_insert_term( $cat_name, 'link_category' );
+
                 if ( ! $cat_id || is_wp_error( $cat_id ) ) {
                         continue;
@@ -986 +1032 @@
                         $cat_id = $cat_id['term_id'];
                 }
+
                 $cat_name = esc_html( $cat_name );
+
                 $x->add(
                         array(
@@ -1023 +1071 @@
         if ( ! $tag || is_wp_error( $tag ) ) {
                 $message = __( 'An error has occurred. Please reload the page and try again.' );
+
                 if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
                         $message = $tag->get_error_message();
@@ -1058 +1107 @@
                 )
         );
+
         $x->add(
                 array(
@@ -1065 +1115 @@
                 )
         );
+
         $x->send();
 }
@@ -1080 +1131 @@
         $taxonomy = sanitize_key( $_POST['tax'] );
         $tax      = get_taxonomy( $taxonomy );
+
         if ( ! $tax ) {
                 wp_die( 0 );
@@ -1124 +1176 @@
 
         echo $return;
-
         wp_die();
 }
@@ -1139 +1190 @@
 function wp_ajax_get_comments( $action ) {
         global $post_id;
+
         if ( empty( $action ) ) {
                 $action = 'get-comments';
         }
+
         check_ajax_referer( $action );
 
@@ -1168 +1221 @@
 
         $x = new WP_Ajax_Response();
+
         ob_start();
         foreach ( $wp_list_table->items as $comment ) {
@@ -1184 +1238 @@
                 )
         );
+
         $x->send();
 }
@@ -1203 +1258 @@
         $comment_post_ID = (int) $_POST['comment_post_ID'];
         $post            = get_post( $comment_post_ID );
+
         if ( ! $post ) {
                 wp_die( -1 );
@@ -1218 +1274 @@
 
         $user = wp_get_current_user();
+
         if ( $user->exists() ) {
                 $user_ID              = $user->ID;
@@ -1225 +1282 @@
                 $comment_content      = trim( $_POST['content'] );
                 $comment_type         = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : '';
+
                 if ( current_user_can( 'unfiltered_html' ) ) {
                         if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) ) {
@@ -1246 +1304 @@
 
         $comment_parent = 0;
+
         if ( isset( $_POST['comment_ID'] ) ) {
                 $comment_parent = absint( $_POST['comment_ID'] );
         }
+
         $comment_auto_approved = false;
         $commentdata           = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID' );
@@ -1274 +1334 @@
 
         $comment = get_comment( $comment_id );
+
         if ( ! $comment ) {
                 wp_die( 1 );
@@ -1335 +1396 @@
 
         $comment_id = (int) $_POST['comment_ID'];
+
         if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
                 wp_die( -1 );
@@ -1353 +1415 @@
 
         $comment = get_comment( $comment_id );
+
         if ( empty( $comment->comment_ID ) ) {
                 wp_die( -1 );
@@ -1391 +1454 @@
         // For performance reasons, we omit some object properties from the checklist.
         // The following is a hacky way to restore them when adding non-custom items.
-
         $menu_items_data = array();
+
         foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
                 if (
@@ -1432 +1495 @@
         foreach ( (array) $item_ids as $menu_item_id ) {
                 $menu_obj = get_post( $menu_item_id );
+
                 if ( ! empty( $menu_obj->ID ) ) {
                         $menu_obj        = wp_setup_nav_menu_item( $menu_obj );
@@ -1455 +1519 @@
                         'walker'      => new $walker_class_name,
                 );
+
                 echo walk_nav_menu_tree( $menu_items, 0, (object) $args );
         }
+
         wp_die();
 }
@@ -1475 +1541 @@
                         wp_die( -1 );
                 }
+
                 if ( isset( $_POST['metakeyselect'] ) && '#NONE#' == $_POST['metakeyselect'] && empty( $_POST['metakeyinput'] ) ) {
                         wp_die( 1 );
@@ -1491 +1558 @@
 
                         $pid = edit_post( $post_data );
+
                         if ( $pid ) {
                                 if ( is_wp_error( $pid ) ) {
@@ -1519 +1587 @@
                 $pid  = (int) $meta->post_id;
                 $meta = get_object_vars( $meta );
-                $x    = new WP_Ajax_Response(
+
+                $x = new WP_Ajax_Response(
                         array(
                                 'what'         => 'meta',
@@ -1532 +1601 @@
                 $key   = wp_unslash( $_POST['meta'][ $mid ]['key'] );
                 $value = wp_unslash( $_POST['meta'][ $mid ]['value'] );
+
                 if ( '' == trim( $key ) ) {
                         wp_die( __( 'Please provide a custom field name.' ) );
                 }
+
                 $meta = get_metadata_by_mid( 'post', $mid );
+
                 if ( ! $meta ) {
                         wp_die( 0 ); // if meta doesn't exist
                 }
-                if ( is_protected_meta( $meta->meta_key, 'post' ) || is_protected_meta( $key, 'post' ) ||
+
+                if (
+                        is_protected_meta( $meta->meta_key, 'post' ) || is_protected_meta( $key, 'post' ) ||
                         ! current_user_can( 'edit_post_meta', $meta->post_id, $meta->meta_key ) ||
-                        ! current_user_can( 'edit_post_meta', $meta->post_id, $key ) ) {
+                        ! current_user_can( 'edit_post_meta', $meta->post_id, $key )
+                ) {
                         wp_die( -1 );
                 }
+
                 if ( $meta->meta_value != $value || $meta->meta_key != $key ) {
                         $u = update_metadata_by_mid( 'post', $mid, $value, $key );
@@ -1585 +1661 @@
 
         check_ajax_referer( $action );
+
         if ( ! current_user_can( 'create_users' ) ) {
                 wp_die( -1 );
         }
+
         $user_id = edit_user();
+
         if ( ! $user_id ) {
                 wp_die( 0 );
@@ -1600 +1679 @@
                 $x->send();
         }
-        $user_object = get_userdata( $user_id );
-
+
+        $user_object   = get_userdata( $user_id );
         $wp_list_table = _get_list_table( 'WP_Users_List_Table' );
 
@@ -1800 +1879 @@
                 wp_die( -1 );
         }
+
         check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
+
         if ( ! isset( $_POST['menu-locations'] ) ) {
                 wp_die( 0 );
         }
+
         set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
         wp_die( 1 );
@@ -1958 +2040 @@
                 $data['comment_status'] = 'closed';
         }
+
         if ( empty( $data['ping_status'] ) ) {
                 $data['ping_status'] = 'closed';
@@ -2013 +2096 @@
         $taxonomy = sanitize_key( $_POST['taxonomy'] );
         $tax      = get_taxonomy( $taxonomy );
+
         if ( ! $tax ) {
                 wp_die( 0 );
@@ -2033 +2117 @@
 
         $updated = wp_update_term( $id, $taxonomy, $_POST );
+
         if ( $updated && ! is_wp_error( $updated ) ) {
                 $tag = get_term( $updated['term_id'], $taxonomy );
@@ -2047 +2132 @@
                 wp_die( __( 'Item not updated.' ) );
         }
+
         $level  = 0;
         $parent = $tag->parent;
+
         while ( $parent > 0 ) {
                 $parent_tag = get_term( $parent, $taxonomy );
@@ -2054 +2141 @@
                 $level++;
         }
+
         $wp_list_table->single_row( $tag, $level );
         wp_die();
@@ -2077 +2165 @@
                 'posts_per_page' => 50,
         );
+
         if ( '' !== $s ) {
                 $args['s'] = $s;
@@ -2142 +2231 @@
         if ( is_array( $_POST['sidebars'] ) ) {
                 $sidebars = array();
+
                 foreach ( wp_unslash( $_POST['sidebars'] ) as $key => $val ) {
                         $sb = array();
+
                         if ( ! empty( $val ) ) {
                                 $val = explode( ',', $val );
+
                                 foreach ( $val as $k => $v ) {
                                         if ( strpos( $v, 'widget-' ) === false ) {
@@ -2156 +2248 @@
                         $sidebars[ $key ] = $sb;
                 }
+
                 wp_set_sidebars_widgets( $sidebars );
                 wp_die( 1 );
@@ -2319 +2412 @@
 
         wp_die();
+}
+
+/**
+ * Ajax handler for creating missing image sub-sizes for just uploaded images.
+ *
+ * @since 5.3.0
+ */
+function wp_ajax_media_create_image_subsizes() {
+        check_ajax_referer( 'media-form' );
+
+        if ( ! current_user_can( 'upload_files' ) ) {
+                wp_send_json_error( array( 'message' => __( 'Sorry, you are not allowed to upload files.' ) ) );
+        }
+
+        // Using Plupload `file.id` as ref.
+        if ( ! empty( $_POST['_wp_temp_image_ref'] ) ) {
+                $image_ref = preg_replace( '/[^a-zA-Z0-9_]/', '', $_POST['_wp_temp_image_ref'] );
+        } else {
+                wp_send_json_error( array( 'message' => __( 'Invalid file reference.' ) ) );
+        }
+
+        // Uploading of images usually fails while creating the sub-sizes, either because of a timeout or out of memory.
+        // At this point the file has been uploaded and an attachment post created, but because of the PHP fatal error
+        // the cliend doesn't know the attachment ID yet.
+        // To be able to find the new attachment_id in these cases we temporarily store an upload reference sent by the client
+        // in the original upload request. It is used to save a transient with the attachment_id as value.
+        // That reference currently is Plupload's `file.id` but can be any sufficiently random alpha-numeric string.
+        $attachment_id = get_transient( '_wp_temp_image_ref:' . $image_ref );
+
+        if ( empty( $attachment_id ) ) {
+                wp_send_json_error( array( 'message' => __( 'Upload failed. Please reload and try again.' ) ) );
+        }
+
+        if ( ! empty( $_POST['_wp_upload_failed_cleanup'] ) ) {
+                // Upload failed. Cleanup.
+                if ( wp_attachment_is_image( $attachment_id ) ) {
+                        $attachment = get_post( $attachment_id );
+
+                        // Posted at most 10 min ago.
+                        if ( $attachment && ( time() - strtotime( $attachment->post_date_gmt ) < 600 ) ) {
+                                /**
+                                 * Runs when an image upload fails during the post-processing phase,
+                                 * and the newly created attachment post is about to be deleted.
+                                 *
+                                 * @since 5.3.0
+                                 *
+                                 * @param int $attachment_id The attachment post ID.
+                                 */
+                                do_action( 'wp_upload_failed_cleanup', $attachment_id );
+
+                                wp_delete_attachment( $attachment_id, true );
+                                wp_send_json_success();
+                        }
+                }
+        }
+
+        // This can still be pretty slow and cause timeout or out of memory errors.
+        // The js that handles the response would need to also handle HTTP 500 errors.
+        wp_update_image_subsizes( $attachment_id );
+
+        if ( ! empty( $_POST['_legasy_support'] ) ) {
+                // The old (inline) uploader. Only needs the attachment_id.
+                $response = array( 'id' => $attachment_id );
+        } else {
+                // Media modal and Media Library grid view.
+                $response = wp_prepare_attachment_for_js( $attachment_id );
+
+                if ( ! $response ) {
+                        wp_send_json_error( array( 'message' => __( 'Upload failed.' ) ) );
+                }
+        }
+
+        // At this point the image has been uploaded successfully.
+        delete_transient( '_wp_temp_image_ref:' . $image_ref );
+
+        wp_send_json_success( $response );
 }
 
@@ -2350 +2519 @@
         if ( isset( $_REQUEST['post_id'] ) ) {
                 $post_id = $_REQUEST['post_id'];
+
                 if ( ! current_user_can( 'edit_post', $post_id ) ) {
                         echo wp_json_encode(
@@ -2376 +2546 @@
         if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
                 $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'] );
+
                 if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
                         echo wp_json_encode(
@@ -2439 +2610 @@
 function wp_ajax_image_editor() {
         $attachment_id = intval( $_POST['postid'] );
+
         if ( empty( $attachment_id ) || ! current_user_can( 'edit_post', $attachment_id ) ) {
                 wp_die( -1 );
@@ -2650 +2822 @@
                 wp_die( 0 );
         }
+
         $post_id = (int) $_POST['post_ID'];
         $post    = get_post( $post_id );
+
         if ( ! $post ) {
                 wp_die( 0 );
@@ -2663 +2837 @@
 
         $active_lock = array_map( 'absint', explode( ':', $_POST['active_post_lock'] ) );
+
         if ( $active_lock[1] != get_current_user_id() ) {
                 wp_die( 0 );
@@ -2687 +2862 @@
 function wp_ajax_dismiss_wp_pointer() {
         $pointer = $_POST['pointer'];
+
         if ( $pointer != sanitize_key( $pointer ) ) {
                 wp_die( 0 );
@@ -2767 +2943 @@
                 'monthnum',
         );
+
         foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) {
                 if ( $t->query_var && isset( $query[ $t->query_var ] ) ) {
@@ -2775 +2952 @@
         $query              = array_intersect_key( $query, array_flip( $keys ) );
         $query['post_type'] = 'attachment';
-        if ( MEDIA_TRASH
-                && ! empty( $_REQUEST['query']['post_status'] )
-                && 'trash' === $_REQUEST['query']['post_status'] ) {
+
+        if (
+                MEDIA_TRASH &&
+                ! empty( $_REQUEST['query']['post_status'] ) &&
+                'trash' === $_REQUEST['query']['post_status']
+        ) {
                 $query['post_status'] = 'trash';
         } else {
@@ -2870 +3050 @@
                 $changed = false;
                 $id3data = wp_get_attachment_metadata( $post['ID'] );
+
                 if ( ! is_array( $id3data ) ) {
                         $changed = true;
                         $id3data = array();
                 }
+
                 foreach ( wp_get_attachment_id3_keys( (object) $post, 'edit' ) as $key => $label ) {
                         if ( isset( $changes[ $key ] ) ) {
@@ -2913 +3095 @@
                 wp_send_json_error();
         }
+
         $attachment_data = $_REQUEST['attachments'][ $id ];
 
@@ -2944 +3127 @@
 
         $attachment = wp_prepare_attachment_for_js( $id );
+
         if ( ! $attachment ) {
                 wp_send_json_error();
@@ -2982 +3166 @@
                         continue;
                 }
+
                 $attachment = get_post( $attachment_id );
+
                 if ( ! $attachment ) {
                         continue;
                 }
+
                 if ( 'attachment' != $attachment->post_type ) {
                         continue;
@@ -3029 +3216 @@
                 // If this attachment is unattached, attach it. Primarily a back compat thing.
                 $insert_into_post_id = intval( $_POST['post_id'] );
+
                 if ( 0 == $post->post_parent && $insert_into_post_id ) {
                         wp_update_post(
@@ -3347 +3535 @@
 
         $update_php = network_admin_url( 'update.php?action=install-theme' );
+
         foreach ( $api->themes as &$theme ) {
                 $theme->install_url = add_query_arg(
@@ -3391 +3580 @@
                 $theme->version     = wp_kses( $theme->version, $themes_allowedtags );
                 $theme->description = wp_kses( $theme->description, $themes_allowedtags );
-                $theme->stars       = wp_star_rating(
+
+                $theme->stars = wp_star_rating(
                         array(
                                 'rating' => $theme->rating,
@@ -3399 +3589 @@
                         )
                 );
+
                 $theme->num_ratings = number_format_i18n( $theme->num_ratings );
                 $theme->preview_url = set_url_scheme( $theme->preview_url );
@@ -3422 +3613 @@
                 wp_send_json_error();
         }
+
         $post_id = isset( $_POST['post_ID'] ) ? intval( $_POST['post_ID'] ) : 0;
+
         if ( $post_id > 0 ) {
                 $post = get_post( $post_id );
+
                 if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
                         wp_send_json_error();
@@ -3437 +3631 @@
         preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches );
         $atts = shortcode_parse_atts( $matches[3] );
+
         if ( ! empty( $matches[5] ) ) {
                 $url = $matches[5];
@@ -3494 +3689 @@
                 $styles     = '';
                 $mce_styles = wpview_media_sandbox_styles();
+
                 foreach ( $mce_styles as $style ) {
                         $styles .= sprintf( '<link rel="stylesheet" href="%s"/>', $style );
@@ -3501 +3697 @@
 
                 global $wp_scripts;
+
                 if ( ! empty( $wp_scripts ) ) {
                         $wp_scripts->done = array();
                 }
+
                 ob_start();
                 wp_print_scripts( array( 'mediaelement-vimeo', 'wp-mediaelement' ) );
@@ -3618 +3816 @@
 function wp_ajax_destroy_sessions() {
         $user = get_userdata( (int) $_POST['user_id'] );
+
         if ( $user ) {
                 if ( ! current_user_can( 'edit_user', $user->ID ) ) {
@@ -3657 +3856 @@
 
         check_ajax_referer( 'image_editor-' . $attachment_id, 'nonce' );
+
         if ( empty( $attachment_id ) || ! current_user_can( 'edit_post', $attachment_id ) ) {
                 wp_send_json_error();
@@ -4047 +4247 @@
         // Check filesystem credentials. `delete_theme()` will bail otherwise.
         $url = wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet );
+
         ob_start();
         $credentials = request_filesystem_credentials( $url );
         ob_end_clean();
+
         if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
                 global $wp_filesystem;
@@ -4340 +4542 @@
         // Check filesystem credentials. `delete_plugins()` will bail otherwise.
         $url = wp_nonce_url( 'plugins.php?action=delete-selected&verify-delete=1&checked[]=' . $plugin, 'bulk-plugins' );
+
         ob_start();
         $credentials = request_filesystem_credentials( $url );
         ob_end_clean();
+
         if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
                 global $wp_filesystem;
@@ -4482 +4686 @@
 function wp_ajax_edit_theme_plugin_file() {
         $r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) ); // Validation of args is done in wp_edit_theme_plugin_file().
+
         if ( is_wp_error( $r ) ) {
                 wp_send_json_error(
@@ -4511 +4716 @@
                 wp_send_json_error( __( 'Missing request ID.' ) );
         }
+
         $request_id = (int) $_POST['id'];
 
@@ -4538 +4744 @@
                 wp_send_json_error( __( 'Missing exporter index.' ) );
         }
+
         $exporter_index = (int) $_POST['exporter'];
 
@@ -4543 +4750 @@
                 wp_send_json_error( __( 'Missing page index.' ) );
         }
+
         $page = (int) $_POST['page'];
 
@@ -4596 +4804 @@
                         );
                 }
+
                 if ( ! array_key_exists( 'exporter_friendly_name', $exporter ) ) {
                         wp_send_json_error(
@@ -4611 +4820 @@
                         );
                 }
+
                 if ( ! is_callable( $exporter['callback'] ) ) {
                         wp_send_json_error(
@@ -4631 +4841 @@
                         );
                 }
+
                 if ( ! array_key_exists( 'data', $response ) ) {
                         wp_send_json_error(
@@ -4637 +4848 @@
                         );
                 }
+
                 if ( ! is_array( $response['data'] ) ) {
                         wp_send_json_error(
@@ -4643 +4855 @@
                         );
                 }
+
                 if ( ! array_key_exists( 'done', $response ) ) {
                         wp_send_json_error(

trunk/src/wp-admin/includes/image.php

@@ -132 +132 @@
  *
  * @param int $attachment_id The image attachment post ID.
- * @return array The updated image meta data array.
+ * @return array|WP_Error The updated image meta data array or WP_Error object
+ *                        if both the image meta and the attached file are missing.
  */
 function wp_update_image_subsizes( $attachment_id ) {
+        $image_meta = wp_get_attachment_metadata( $attachment_id );
+        $image_file = get_attached_file( $attachment_id );
+
+        if ( empty( $image_meta ) || ! is_array( $image_meta ) ) {
+                // Previously failed upload?
+                // If there is an uploaded file, make all sub-sizes and generate all of the attachment meta.
+                if ( ! empty( $image_file ) ) {
+                        return wp_create_image_subsizes( $image_file, array(), $attachment_id );
+                } else {
+                        return new WP_Error( 'invalid_attachment', __( 'The attached file cannot be found.' ) );
+                }
+        }
+
         $missing_sizes = wp_get_missing_image_subsizes( $attachment_id );
-        $image_meta    = wp_get_attachment_metadata( $attachment_id );
 
         if ( empty( $missing_sizes ) ) {
                 return $image_meta;
         }
-
-        $image_file = get_attached_file( $attachment_id );
 
         // This also updates the image meta.

trunk/src/wp-admin/includes/media.php

@@ -81 +81 @@
         if ( ! empty( $tabs ) ) {
                 echo "<ul id='sidemenu'>\n";
+
                 if ( isset( $redir_tab ) && array_key_exists( $redir_tab, $tabs ) ) {
                         $current = $redir_tab;
@@ -109 +110 @@
                         echo "\t<li id='" . esc_attr( "tab-$callback" ) . "'>$link</li>\n";
                 }
+
                 echo "</ul>\n";
         }
@@ -266 +268 @@
 function media_send_to_editor( $html ) {
         ?>
-<script type="text/javascript">
-var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
-</script>
+        <script type="text/javascript">
+        var win = window.dialogArguments || opener || parent || top;
+        win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
+        </script>
         <?php
         exit;
@@ -287 +289 @@
  */
 function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false ) ) {
-
         $time = current_time( 'mysql' );
         $post = get_post( $post_id );
+
         if ( $post ) {
                 // The post date doesn't usually matter for pages, so don't backdate this upload.
@@ -307 +309 @@
         $name = wp_basename( $name, ".$ext" );
 
-        $url     = $file['url'];
-        $type    = $file['type'];
-        $file    = $file['file'];
-        $title   = sanitize_text_field( $name );
-        $content = '';
-        $excerpt = '';
+        $url       = $file['url'];
+        $type      = $file['type'];
+        $file      = $file['file'];
+        $title     = sanitize_text_field( $name );
+        $content   = '';
+        $excerpt   = '';
+        $image_ref = false;
 
         if ( preg_match( '#^audio#', $type ) ) {
@@ -357 +360 @@
                 if ( ! empty( $meta['track_number'] ) ) {
                         $track_number = explode( '/', $meta['track_number'] );
+
                         if ( isset( $track_number[1] ) ) {
                                 /* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks. */
@@ -373 +377 @@
                 // Use image exif/iptc data for title and caption defaults if possible.
         } elseif ( 0 === strpos( $type, 'image/' ) ) {
+                // Image file reference passed by the uploader.
+                if ( ! empty( $_POST['_wp_temp_image_ref'] ) ) {
+                        $image_ref = preg_replace( '/[^a-zA-Z0-9_]/', '', $_POST['_wp_temp_image_ref'] );
+                }
+
                 $image_meta = wp_read_image_metadata( $file );
+
                 if ( $image_meta ) {
                         if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
@@ -402 +412 @@
 
         // Save the data
-        $id = wp_insert_attachment( $attachment, $file, $post_id, true );
-        if ( ! is_wp_error( $id ) ) {
-                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-        }
-
-        return $id;
-
+        $attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
+
+        if ( ! is_wp_error( $attachment_id ) ) {
+                // If an image, keep the upload reference until all image sub-sizes are created.
+                if ( $image_ref ) {
+                        set_transient( '_wp_temp_image_ref:' . $image_ref, $attachment_id, HOUR_IN_SECONDS );
+                }
+
+                // The image sub-sizes are created during wp_generate_attachment_metadata().
+                // This is generally slow and may cause timeouts or out of memory errors.
+                wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+
+                // At this point the image is uploaded successfully even if there were specific errors or some sub-sizes were not created.
+                // The transient is not needed any more.
+                if ( $image_ref ) {
+                        delete_transient( '_wp_temp_image_ref:' . $image_ref );
+                }
+        }
+
+        return $attachment_id;
 }
 
@@ -427 +450 @@
         $time = current_time( 'mysql' );
         $post = get_post( $post_id );
+
         if ( $post ) {
                 if ( substr( $post->post_date, 0, 4 ) > 0 ) {
@@ -434 +458 @@
 
         $file = wp_handle_sideload( $file_array, $overrides, $time );
+
         if ( isset( $file['error'] ) ) {
                 return new WP_Error( 'upload_error', $file['error'] );
@@ -446 +471 @@
         // Use image exif/iptc data for title and caption defaults if possible.
         $image_meta = wp_read_image_metadata( $file );
+
         if ( $image_meta ) {
                 if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
                         $title = $image_meta['title'];
                 }
+
                 if ( trim( $image_meta['caption'] ) ) {
                         $content = $image_meta['caption'];
@@ -475 +502 @@
 
         // Save the attachment metadata
-        $id = wp_insert_attachment( $attachment, $file, $post_id, true );
-        if ( ! is_wp_error( $id ) ) {
-                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-        }
-
-        return $id;
+        $attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
+
+        if ( ! is_wp_error( $attachment_id ) ) {
+                wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+        }
+
+        return $attachment_id;
 }
 
@@ -496 +524 @@
         _wp_admin_html_begin();
         ?>
-<title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
+        <title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
         <?php
 
         wp_enqueue_style( 'colors' );
         // Check callback name for 'media'
-        if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
-        || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) {
+        if (
+                ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) ) ||
+                ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) )
+        ) {
                 wp_enqueue_style( 'deprecated-media' );
         }
         wp_enqueue_style( 'ie' );
+
         ?>
-<script type="text/javascript">
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
-isRtl = <?php echo (int) is_rtl(); ?>;
-</script>
+        <script type="text/javascript">
+        addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+        var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+        isRtl = <?php echo (int) is_rtl(); ?>;
+        </script>
         <?php
         /** This action is documented in wp-admin/admin-header.php */
@@ -563 +594 @@
 
         $body_id_attr = '';
+
         if ( isset( $GLOBALS['body_id'] ) ) {
                 $body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
         }
+
         ?>
-</head>
-<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
-<script type="text/javascript">
-document.body.className = document.body.className.replace('no-js', 'js');
-</script>
+        </head>
+        <body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
+        <script type="text/javascript">
+        document.body.className = document.body.className.replace('no-js', 'js');
+        </script>
         <?php
+
         $args = func_get_args();
         $args = array_slice( $args, 1 );
@@ -579 +613 @@
         /** This action is documented in wp-admin/admin-footer.php */
         do_action( 'admin_print_footer_scripts' );
+
         ?>
-<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
-</body>
-</html>
+        <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+        </body>
+        </html>
         <?php
 }
@@ -602 +637 @@
 
         $post = get_post();
+
         if ( ! $post && ! empty( $GLOBALS['post_ID'] ) ) {
                 $post = $GLOBALS['post_ID'];
         }
 
-        wp_enqueue_media(
-                array(
-                        'post' => $post,
-                )
-        );
+        wp_enqueue_media( array( 'post' => $post ) );
 
         $img = '<span class="wp-media-buttons-icon"></span> ';
 
         $id_attribute = $instance === 1 ? ' id="insert-media-button"' : '';
+
         printf(
                 '<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
@@ -621 +654 @@
                 $img . __( 'Add Media' )
         );
+
         /**
          * Filters the legacy (pre-3.5.0) media buttons.
@@ -710 +744 @@
                                 $post['post_content'] = $attachment['post_content'];
                         }
+
                         if ( isset( $attachment['post_title'] ) ) {
                                 $post['post_title'] = $attachment['post_title'];
                         }
+
                         if ( isset( $attachment['post_excerpt'] ) ) {
                                 $post['post_excerpt'] = $attachment['post_excerpt'];
                         }
+
                         if ( isset( $attachment['menu_order'] ) ) {
                                 $post['menu_order'] = $attachment['menu_order'];
@@ -740 +777 @@
                         if ( isset( $attachment['image_alt'] ) ) {
                                 $image_alt = wp_unslash( $attachment['image_alt'] );
+
                                 if ( $image_alt != get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) {
                                         $image_alt = wp_strip_all_tags( $image_alt, true );
@@ -772 +810 @@
                 </script>
                 <?php
+
                 exit;
         }
@@ -777 +816 @@
         if ( isset( $send_id ) ) {
                 $attachment = wp_unslash( $_POST['attachments'][ $send_id ] );
-
-                $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
+                $html       = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
+
                 if ( ! empty( $attachment['url'] ) ) {
                         $rel = '';
+
                         if ( strpos( $attachment['url'], 'attachment_id' ) || get_attachment_link( $send_id ) == $attachment['url'] ) {
                                 $rel = " rel='attachment wp-att-" . esc_attr( $send_id ) . "'";
                         }
+
                         $html = "<a href='{$attachment['url']}'$rel>$html</a>";
                 }
@@ -799 +840 @@
                  */
                 $html = apply_filters( 'media_send_to_editor', $html, $send_id, $attachment );
+
                 return media_send_to_editor( $html );
         }
@@ -821 +863 @@
                 $id = media_handle_upload( 'async-upload', $_REQUEST['post_id'] );
                 unset( $_FILES );
+
                 if ( is_wp_error( $id ) ) {
                         $errors['upload_error'] = $id;
@@ -829 +872 @@
         if ( ! empty( $_POST['insertonlybutton'] ) ) {
                 $src = $_POST['src'];
+
                 if ( ! empty( $src ) && ! strpos( $src, '://' ) ) {
                         $src = "http://$src";
@@ -845 +889 @@
                         $type = 'file';
                         $ext  = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
+
                         if ( $ext ) {
                                 $ext_type = wp_ext2type( $ext );
@@ -868 +913 @@
                         $align = '';
                         $alt   = esc_attr( wp_unslash( $_POST['alt'] ) );
+
                         if ( isset( $_POST['align'] ) ) {
                                 $align = esc_attr( wp_unslash( $_POST['align'] ) );
                                 $class = " class='align$align'";
                         }
+
                         if ( ! empty( $src ) ) {
                                 $html = "<img src='" . esc_url( $src ) . "' alt='$alt'$class />";
@@ -896 +943 @@
                 $errors['upload_notice'] = __( 'Saved.' );
                 wp_enqueue_script( 'admin-gallery' );
+
                 return wp_iframe( 'media_upload_gallery_form', $errors );
 
@@ -904 +952 @@
                         return $return;
                 }
+
                 if ( is_array( $return ) ) {
                         $errors = $return;
@@ -911 +960 @@
         if ( isset( $_GET['tab'] ) && $_GET['tab'] == 'type_url' ) {
                 $type = 'image';
+
                 if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) {
                         $type = $_GET['type'];
                 }
+
                 return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
         }
@@ -938 +989 @@
                 // Set variables for storage, fix file filename for query strings.
                 preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+
                 if ( ! $matches ) {
                         return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
@@ -976 +1028 @@
                 $alt  = isset( $desc ) ? esc_attr( $desc ) : '';
                 $html = "<img src='$src' alt='$alt' />";
+
                 return $html;
         } else {
@@ -998 +1051 @@
                         return $return;
                 }
+
                 if ( is_array( $return ) ) {
                         $errors = $return;
@@ -1016 +1070 @@
 function media_upload_library() {
         $errors = array();
+
         if ( ! empty( $_POST ) ) {
                 $return = media_upload_form_handler();
@@ -1051 +1106 @@
                 'right'  => __( 'Right' ),
         );
+
         if ( ! array_key_exists( (string) $checked, $alignments ) ) {
                 $checked = 'none';
@@ -1056 +1112 @@
 
         $out = array();
+
         foreach ( $alignments as $name => $label ) {
                 $name  = esc_attr( $name );
@@ -1062 +1119 @@
                         " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
         }
+
         return join( "\n", $out );
 }
@@ -1096 +1154 @@
                 $check = get_user_setting( 'imgsize', 'medium' );
         }
+
         $out = array();
 
@@ -1161 +1220 @@
 
         $url = '';
+
         if ( $url_type == 'file' ) {
                 $url = $file;
@@ -1268 +1328 @@
 function image_media_send_to_editor( $html, $attachment_id, $attachment ) {
         $post = get_post( $attachment_id );
+
         if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
                 $url   = $attachment['url'];
@@ -1294 +1355 @@
                 $post = get_post( $post );
         }
+
         if ( is_array( $post ) ) {
                 $post = new WP_Post( (object) $post );
@@ -1339 +1401 @@
         foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
                 $t = (array) get_taxonomy( $taxonomy );
+
                 if ( ! $t['public'] || ! $t['show_ui'] ) {
                         continue;
                 }
+
                 if ( empty( $t['label'] ) ) {
                         $t['label'] = $taxonomy;
                 }
+
                 if ( empty( $t['args'] ) ) {
                         $t['args'] = array();
@@ -1350 +1415 @@
 
                 $terms = get_object_term_cache( $post->ID, $taxonomy );
+
                 if ( false === $terms ) {
                         $terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
@@ -1359 +1425 @@
                         $values[] = $term->slug;
                 }
+
                 $t['value'] = join( ', ', $values );
 
@@ -1371 +1438 @@
         if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
                 $alt = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
+
                 if ( empty( $alt ) ) {
                         $alt = '';
@@ -1425 +1493 @@
 function get_media_items( $post_id, $errors ) {
         $attachments = array();
+
         if ( $post_id ) {
                 $post = get_post( $post_id );
+
                 if ( $post && $post->post_type == 'attachment' ) {
                         $attachments = array( $post->ID => $post );
@@ -1452 +1522 @@
                         continue;
                 }
+
                 $item = get_media_item( $id, array( 'errors' => isset( $errors[ $id ] ) ? $errors[ $id ] : null ) );
+
                 if ( $item ) {
                         $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
@@ -1480 +1552 @@
         if ( $attachment_id ) {
                 $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true );
+
                 if ( $thumb_url ) {
                         $thumb_url = $thumb_url[0];
@@ -1526 +1599 @@
                 $class        = empty( $parsed_args['errors'] ) ? 'startclosed' : 'startopen';
                 $toggle_links = "
-        <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
-        <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
+                <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
+                <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
         } else {
                 $class        = '';
@@ -1554 +1627 @@
         $media_dims = '';
         $meta       = wp_get_attachment_metadata( $post->ID );
+
         if ( isset( $meta['width'], $meta['height'] ) ) {
                 $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
@@ -1569 +1643 @@
 
         $image_edit_button = '';
+
         if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
                 $nonce             = wp_create_nonce( "image_editor-$post->ID" );
@@ -1577 +1652 @@
 
         $item = "
-        $type_html
-        $toggle_links
-        $order
-        $display_title
-        <table class='slidetoggle describe $class'>
-                <thead class='media-item-info' id='media-head-$post->ID'>
-                <tr>
+                $type_html
+                $toggle_links
+                $order
+                $display_title
+                <table class='slidetoggle describe $class'>
+                        <thead class='media-item-info' id='media-head-$post->ID'>
+                        <tr>
                         <td class='A1B1' id='thumbnail-head-$post->ID'>
                         <p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>
@@ -1592 +1667 @@
                         <p><strong>" . __( 'File type:' ) . "</strong> $post->post_mime_type</p>
                         <p><strong>" . __( 'Upload date:' ) . '</strong> ' . mysql2date( __( 'F j, Y' ), $post->post_date ) . '</p>';
+
         if ( ! empty( $media_dims ) ) {
                 $item .= '<p><strong>' . __( 'Dimensions:' ) . "</strong> $media_dims</p>\n";
         }
 
-                        $item .= "</td></tr>\n";
+        $item .= "</td></tr>\n";
 
         $item .= "
@@ -1641 +1717 @@
         $thumbnail       = '';
         $calling_post_id = 0;
+
         if ( isset( $_GET['post_id'] ) ) {
                 $calling_post_id = absint( $_GET['post_id'] );
@@ -1646 +1723 @@
                 $calling_post_id = $post->post_parent;
         }
+
         if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
                 && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
@@ -1659 +1737 @@
                 $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $parsed_args['send'] . " $thumbnail $delete</td></tr>\n" );
         }
+
         $hidden_fields = array();
 
@@ -1685 +1764 @@
 
                 $item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
+
                 if ( ! empty( $field[ $field['input'] ] ) ) {
                         $item .= $field[ $field['input'] ];
@@ -1697 +1777 @@
                         $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr} />";
                 }
+
                 if ( ! empty( $field['helps'] ) ) {
                         $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
@@ -1728 +1809 @@
                 $item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
         }
+
         $item .= "\t</tbody>\n";
         $item .= "\t</table>\n";
@@ -1771 +1853 @@
                 foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
                         $t = (array) get_taxonomy( $taxonomy );
+
                         if ( ! $t['public'] || ! $t['show_ui'] ) {
                                 continue;
                         }
+
                         if ( empty( $t['label'] ) ) {
                                 $t['label'] = $taxonomy;
                         }
+
                         if ( empty( $t['args'] ) ) {
                                 $t['args'] = array();
@@ -1782 +1867 @@
 
                         $terms = get_object_term_cache( $post->ID, $taxonomy );
+
                         if ( false === $terms ) {
                                 $terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
@@ -1791 +1877 @@
                                 $values[] = $term->slug;
                         }
+
                         $t['value']    = join( ', ', $values );
                         $t['taxonomy'] = true;
@@ -1832 +1919 @@
 
         $item = '';
+
         foreach ( $form_fields as $id => $field ) {
                 if ( $id[0] == '_' ) {
@@ -1877 +1965 @@
                         $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr} />";
                 }
+
                 if ( ! empty( $field['helps'] ) ) {
                         $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
                 }
+
                 $item .= "</td>\n\t\t</tr>\n";
 
@@ -1940 +2030 @@
 
         echo '<script type="text/javascript">post_id = ' . $post_id . ';</script>';
+
         if ( empty( $_GET['chromeless'] ) ) {
                 echo '<div id="media-upload-header">';
@@ -1980 +2071 @@
                 $max_upload_size = 0;
         }
+
         ?>
-
-<div id="media-upload-notice">
+        <div id="media-upload-notice">
         <?php
 
@@ -1990 +2081 @@
 
         ?>
-</div>
-<div id="media-upload-error">
+        </div>
+        <div id="media-upload-error">
         <?php
 
@@ -1999 +2090 @@
 
         ?>
-</div>
+        </div>
         <?php
+
         if ( is_multisite() && ! is_upload_space_available() ) {
                 /**
@@ -2046 +2138 @@
                 'file_data_name'   => 'async-upload',
                 'url'              => $upload_action_url,
-                'filters'          => array(
-                        'max_file_size' => $max_upload_size . 'b',
-                ),
+                'filters'          => array( 'max_file_size' => $max_upload_size . 'b' ),
                 'multipart_params' => $post_params,
         );
@@ -2054 +2144 @@
         // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
         // when enabled. See #29602.
-        if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-        strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
-
+        if (
+                wp_is_mobile() &&
+                strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+                strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false
+        ) {
                 $plupload_init['multi_selection'] = false;
         }
@@ -2070 +2162 @@
 
         ?>
-
-<script type="text/javascript">
+        <script type="text/javascript">
         <?php
         // Verify size is an int. If not return default value.
         $large_size_h = absint( get_option( 'large_size_h' ) );
+
         if ( ! $large_size_h ) {
                 $large_size_h = 1024;
         }
+
         $large_size_w = absint( get_option( 'large_size_w' ) );
+
         if ( ! $large_size_w ) {
                 $large_size_w = 1024;
         }
+
         ?>
-var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
-wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
-</script>
-
-<div id="plupload-upload-ui" class="hide-if-no-js">
+        var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
+        wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
+        </script>
+
+        <div id="plupload-upload-ui" class="hide-if-no-js">
         <?php
         /**
@@ -2096 +2191 @@
          */
         do_action( 'pre-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
         ?>
-<div id="drag-drop-area">
-        <div class="drag-drop-inside">
-        <p class="drag-drop-info"><?php _e( 'Drop files to upload' ); ?></p>
-        <p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-        <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
+        <div id="drag-drop-area">
+                <div class="drag-drop-inside">
+                <p class="drag-drop-info"><?php _e( 'Drop files to upload' ); ?></p>
+                <p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
+                <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
+                </div>
         </div>
-</div>
         <?php
         /**
@@ -2113 +2209 @@
         do_action( 'post-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
         ?>
-</div>
-
-<div id="html-upload-ui" class="hide-if-js">
+        </div>
+
+        <div id="html-upload-ui" class="hide-if-js">
         <?php
         /**
@@ -2123 +2219 @@
          */
         do_action( 'pre-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
         ?>
         <p id="async-upload-wrap">
@@ -2138 +2235 @@
          */
         do_action( 'post-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
         ?>
-</div>
+        </div>
 
 <p class="max-upload-size">
@@ -2190 +2288 @@
                 $form_class .= ' html-uploader';
         }
+
         ?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
-        <?php submit_button( '', 'hidden', 'save', false ); ?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-        <?php wp_nonce_field( 'media-form' ); ?>
-
-<h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
+        <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+                <?php submit_button( '', 'hidden', 'save', false ); ?>
+        <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+                <?php wp_nonce_field( 'media-form' ); ?>
+
+        <h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
 
         <?php media_upload_form( $errors ); ?>
 
-<script type="text/javascript">
-jQuery(function($){
-        var preloaded = $(".media-item.preloaded");
-        if ( preloaded.length > 0 ) {
-                preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-        }
-        updateMediaForm();
-});
-</script>
-<div id="media-items">
+        <script type="text/javascript">
+        jQuery(function($){
+                var preloaded = $(".media-item.preloaded");
+                if ( preloaded.length > 0 ) {
+                        preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+                }
+                updateMediaForm();
+        });
+        </script>
+        <div id="media-items">
         <?php
 
@@ -2222 +2320 @@
                 }
         }
+
         ?>
-</div>
-
-<p class="savebutton ml-submit">
-        <?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
-</p>
-</form>
+        </div>
+
+        <p class="savebutton ml-submit">
+                <?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
+        </p>
+        </form>
         <?php
 }
@@ -2258 +2357 @@
                 $form_class .= ' html-uploader';
         }
+
         ?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-        <?php wp_nonce_field( 'media-form' ); ?>
-
-<h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
-
-<script type="text/javascript">
-var addExtImage = {
+        <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+        <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+                <?php wp_nonce_field( 'media-form' ); ?>
+
+        <h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
+
+        <script type="text/javascript">
+        var addExtImage = {
 
         width : '',
@@ -2282 +2381 @@
                         alt = f.alt.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
-        <?php
-        /** This filter is documented in wp-admin/includes/media.php */
-        if ( ! apply_filters( 'disable_captions', '' ) ) {
+                <?php
+                /** This filter is documented in wp-admin/includes/media.php */
+                if ( ! apply_filters( 'disable_captions', '' ) ) {
+                        ?>
+                        if ( f.caption.value ) {
+                                caption = f.caption.value.replace(/\r\n|\r/g, '\n');
+                                caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
+                                        return a.replace(/[\r\n\t]+/, ' ');
+                                });
+
+                                caption = caption.replace(/\s*\n\s*/g, '<br />');
+                        }
+                        <?php
+                }
+
                 ?>
-        if ( f.caption.value ) {
-                caption = f.caption.value.replace(/\r\n|\r/g, '\n');
-                caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
-                        return a.replace(/[\r\n\t]+/, ' ');
-                });
-
-                caption = caption.replace(/\s*\n\s*/g, '<br />');
-        }
-        <?php } ?>
-
                 cls = caption ? '' : ' class="'+t.align+'"';
 
@@ -2349 +2450 @@
                 t.preloadImg.src = src;
         }
-};
-
-jQuery(document).ready( function($) {
-        $('.media-types input').click( function() {
-                $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+        };
+
+        jQuery(document).ready( function($) {
+                $('.media-types input').click( function() {
+                        $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+                });
         });
-});
-</script>
-
-<div id="media-items">
-<div class="media-item media-blank">
+        </script>
+
+        <div id="media-items">
+        <div class="media-item media-blank">
         <?php
         /**
@@ -2369 +2470 @@
          */
         echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
+
         ?>
-</div>
-</div>
-</form>
+        </div>
+        </div>
+        </form>
         <?php
 }
@@ -2402 +2504 @@
                 $form_class .= ' html-uploader';
         }
+
         ?>
-
-<script type="text/javascript">
-jQuery(function($){
-        var preloaded = $(".media-item.preloaded");
-        if ( preloaded.length > 0 ) {
-                preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-                updateMediaForm();
-        }
-});
-</script>
-<div id="sort-buttons" class="hide-if-no-js">
-<span>
-        <?php _e( 'All Tabs:' ); ?>
-<a href="#" id="showall"><?php _e( 'Show' ); ?></a>
-<a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
-</span>
-        <?php _e( 'Sort Order:' ); ?>
-<a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
-<a href="#" id="desc"><?php _e( 'Descending' ); ?></a> |
-<a href="#" id="clear"><?php _ex( 'Clear', 'verb' ); ?></a>
-</div>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
-        <?php wp_nonce_field( 'media-form' ); ?>
-        <?php //media_upload_form( $errors ); ?>
-<table class="widefat">
-<thead><tr>
-<th><?php _e( 'Media' ); ?></th>
-<th class="order-head"><?php _e( 'Order' ); ?></th>
-<th class="actions-head"><?php _e( 'Actions' ); ?></th>
-</tr></thead>
-</table>
-<div id="media-items">
-        <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-        <?php echo get_media_items( $post_id, $errors ); ?>
-</div>
-
-<p class="ml-submit">
-        <?php
-        submit_button(
-                __( 'Save all changes' ),
-                'savebutton',
-                'save',
-                false,
-                array(
-                        'id'    => 'save-all',
-                        'style' => 'display: none;',
-                )
-        );
-        ?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
-<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
-</p>
-
-<div id="gallery-settings" style="display:none;">
-<div class="title"><?php _e( 'Gallery Settings' ); ?></div>
-<table id="basic" class="describe"><tbody>
-        <tr>
-        <th scope="row" class="label">
-                <label>
-                <span class="alignleft"><?php _e( 'Link thumbnails to:' ); ?></span>
-                </label>
-        </th>
-        <td class="field">
-                <input type="radio" name="linkto" id="linkto-file" value="file" />
-                <label for="linkto-file" class="radio"><?php _e( 'Image File' ); ?></label>
-
-                <input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
-                <label for="linkto-post" class="radio"><?php _e( 'Attachment Page' ); ?></label>
-        </td>
-        </tr>
-
-        <tr>
-        <th scope="row" class="label">
-                <label>
-                <span class="alignleft"><?php _e( 'Order images by:' ); ?></span>
-                </label>
-        </th>
-        <td class="field">
-                <select id="orderby" name="orderby">
-                        <option value="menu_order" selected="selected"><?php _e( 'Menu order' ); ?></option>
-                        <option value="title"><?php _e( 'Title' ); ?></option>
-                        <option value="post_date"><?php _e( 'Date/Time' ); ?></option>
-                        <option value="rand"><?php _e( 'Random' ); ?></option>
-                </select>
-        </td>
-        </tr>
-
-        <tr>
-        <th scope="row" class="label">
-                <label>
-                <span class="alignleft"><?php _e( 'Order:' ); ?></span>
-                </label>
-        </th>
-        <td class="field">
-                <input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
-                <label for="order-asc" class="radio"><?php _e( 'Ascending' ); ?></label>
-
-                <input type="radio" name="order" id="order-desc" value="desc" />
-                <label for="order-desc" class="radio"><?php _e( 'Descending' ); ?></label>
-        </td>
-        </tr>
-
-        <tr>
-        <th scope="row" class="label">
-                <label>
-                <span class="alignleft"><?php _e( 'Gallery columns:' ); ?></span>
-                </label>
-        </th>
-        <td class="field">
-                <select id="columns" name="columns">
-                        <option value="1">1</option>
-                        <option value="2">2</option>
-                        <option value="3" selected="selected">3</option>
-                        <option value="4">4</option>
-                        <option value="5">5</option>
-                        <option value="6">6</option>
-                        <option value="7">7</option>
-                        <option value="8">8</option>
-                        <option value="9">9</option>
-                </select>
-        </td>
-        </tr>
-</tbody></table>
-
-<p class="ml-submit">
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
-</p>
-</div>
-</form>
+        <script type="text/javascript">
+        jQuery(function($){
+                var preloaded = $(".media-item.preloaded");
+                if ( preloaded.length > 0 ) {
+                        preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+                        updateMediaForm();
+                }
+        });
+        </script>
+        <div id="sort-buttons" class="hide-if-no-js">
+        <span>
+                <?php _e( 'All Tabs:' ); ?>
+        <a href="#" id="showall"><?php _e( 'Show' ); ?></a>
+        <a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
+        </span>
+                <?php _e( 'Sort Order:' ); ?>
+        <a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
+        <a href="#" id="desc"><?php _e( 'Descending' ); ?></a> |
+        <a href="#" id="clear"><?php _ex( 'Clear', 'verb' ); ?></a>
+        </div>
+        <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
+                <?php wp_nonce_field( 'media-form' ); ?>
+                <?php //media_upload_form( $errors ); ?>
+        <table class="widefat">
+        <thead><tr>
+        <th><?php _e( 'Media' ); ?></th>
+        <th class="order-head"><?php _e( 'Order' ); ?></th>
+        <th class="actions-head"><?php _e( 'Actions' ); ?></th>
+        </tr></thead>
+        </table>
+        <div id="media-items">
+                <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+                <?php echo get_media_items( $post_id, $errors ); ?>
+        </div>
+
+        <p class="ml-submit">
+                <?php
+                submit_button(
+                        __( 'Save all changes' ),
+                        'savebutton',
+                        'save',
+                        false,
+                        array(
+                                'id'    => 'save-all',
+                                'style' => 'display: none;',
+                        )
+                );
+                ?>
+        <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+        <input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
+        <input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
+        </p>
+
+        <div id="gallery-settings" style="display:none;">
+        <div class="title"><?php _e( 'Gallery Settings' ); ?></div>
+        <table id="basic" class="describe"><tbody>
+                <tr>
+                <th scope="row" class="label">
+                        <label>
+                        <span class="alignleft"><?php _e( 'Link thumbnails to:' ); ?></span>
+                        </label>
+                </th>
+                <td class="field">
+                        <input type="radio" name="linkto" id="linkto-file" value="file" />
+                        <label for="linkto-file" class="radio"><?php _e( 'Image File' ); ?></label>
+
+                        <input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
+                        <label for="linkto-post" class="radio"><?php _e( 'Attachment Page' ); ?></label>
+                </td>
+                </tr>
+
+                <tr>
+                <th scope="row" class="label">
+                        <label>
+                        <span class="alignleft"><?php _e( 'Order images by:' ); ?></span>
+                        </label>
+                </th>
+                <td class="field">
+                        <select id="orderby" name="orderby">
+                                <option value="menu_order" selected="selected"><?php _e( 'Menu order' ); ?></option>
+                                <option value="title"><?php _e( 'Title' ); ?></option>
+                                <option value="post_date"><?php _e( 'Date/Time' ); ?></option>
+                                <option value="rand"><?php _e( 'Random' ); ?></option>
+                        </select>
+                </td>
+                </tr>
+
+                <tr>
+                <th scope="row" class="label">
+                        <label>
+                        <span class="alignleft"><?php _e( 'Order:' ); ?></span>
+                        </label>
+                </th>
+                <td class="field">
+                        <input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
+                        <label for="order-asc" class="radio"><?php _e( 'Ascending' ); ?></label>
+
+                        <input type="radio" name="order" id="order-desc" value="desc" />
+                        <label for="order-desc" class="radio"><?php _e( 'Descending' ); ?></label>
+                </td>
+                </tr>
+
+                <tr>
+                <th scope="row" class="label">
+                        <label>
+                        <span class="alignleft"><?php _e( 'Gallery columns:' ); ?></span>
+                        </label>
+                </th>
+                <td class="field">
+                        <select id="columns" name="columns">
+                                <option value="1">1</option>
+                                <option value="2">2</option>
+                                <option value="3" selected="selected">3</option>
+                                <option value="4">4</option>
+                                <option value="5">5</option>
+                                <option value="6">6</option>
+                                <option value="7">7</option>
+                                <option value="8">8</option>
+                                <option value="9">9</option>
+                        </select>
+                </td>
+                </tr>
+        </tbody></table>
+
+        <p class="ml-submit">
+        <input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
+        <input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
+        </p>
+        </div>
+        </form>
         <?php
 }
@@ -2581 +2683 @@
 
         ?>
-
-<form id="filter" method="get">
-<input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
-<input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
-<input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
-<input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
-
-<p id="media-search" class="search-box">
-        <label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
-        <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
-        <?php submit_button( __( 'Search Media' ), '', '', false ); ?>
-</p>
-
-<ul class="subsubsub">
-        <?php
-        $type_links = array();
-        $_num_posts = (array) wp_count_attachments();
-        $matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
-        foreach ( $matches as $_type => $reals ) {
-                foreach ( $reals as $real ) {
-                        if ( isset( $num_posts[ $_type ] ) ) {
-                                $num_posts[ $_type ] += $_num_posts[ $real ];
-                        } else {
-                                $num_posts[ $_type ] = $_num_posts[ $real ];
-                        }
-                }
-        }
-        // If available type specified by media button clicked, filter by that type
-        if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
-                $_GET['post_mime_type']                        = $type;
-                list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-        }
-        if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
-                $class = ' class="current"';
-        } else {
-                $class = '';
-        }
-        $type_links[] = '<li><a href="' . esc_url(
-                add_query_arg(
-                        array(
-                                'post_mime_type' => 'all',
-                                'paged'          => false,
-                                'm'              => false,
-                        )
-                )
-        ) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
-        foreach ( $post_mime_types as $mime_type => $label ) {
-                $class = '';
-
-                if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
-                        continue;
-                }
-
-                if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+        <form id="filter" method="get">
+        <input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
+        <input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
+        <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
+        <input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
+        <input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
+
+        <p id="media-search" class="search-box">
+                <label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
+                <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
+                <?php submit_button( __( 'Search Media' ), '', '', false ); ?>
+        </p>
+
+        <ul class="subsubsub">
+                <?php
+                $type_links = array();
+                $_num_posts = (array) wp_count_attachments();
+                $matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
+                foreach ( $matches as $_type => $reals ) {
+                        foreach ( $reals as $real ) {
+                                if ( isset( $num_posts[ $_type ] ) ) {
+                                        $num_posts[ $_type ] += $_num_posts[ $real ];
+                                } else {
+                                        $num_posts[ $_type ] = $_num_posts[ $real ];
+                                }
+                        }
+                }
+                // If available type specified by media button clicked, filter by that type
+                if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
+                        $_GET['post_mime_type']                        = $type;
+                        list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
+                }
+                if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
                         $class = ' class="current"';
-                }
-
+                } else {
+                        $class = '';
+                }
                 $type_links[] = '<li><a href="' . esc_url(
                         add_query_arg(
                                 array(
-                                        'post_mime_type' => $mime_type,
+                                        'post_mime_type' => 'all',
                                         'paged'          => false,
+                                        'm'              => false,
                                 )
                         )
-                ) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
-        }
-        /**
-         * Filters the media upload mime type list items.
-         *
-         * Returned values should begin with an `<li>` tag.
-         *
-         * @since 3.1.0
-         *
-         * @param string[] $type_links An array of list items containing mime type link HTML.
-         */
-        echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
-        unset( $type_links );
-        ?>
-</ul>
-
-<div class="tablenav">
-
-        <?php
-        $page_links = paginate_links(
-                array(
-                        'base'      => add_query_arg( 'paged', '%#%' ),
-                        'format'    => '',
-                        'prev_text' => __( '&laquo;' ),
-                        'next_text' => __( '&raquo;' ),
-                        'total'     => ceil( $wp_query->found_posts / 10 ),
-                        'current'   => $q['paged'],
-                )
-        );
-
-        if ( $page_links ) {
-                echo "<div class='tablenav-pages'>$page_links</div>";
-        }
-        ?>
-
-<div class="alignleft actions">
-        <?php
-
-        $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
-
-        $arc_result = $wpdb->get_results( $arc_query );
-
-        $month_count    = count( $arc_result );
-        $selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
-
-        if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
+                ) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
+                foreach ( $post_mime_types as $mime_type => $label ) {
+                        $class = '';
+
+                        if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
+                                continue;
+                        }
+
+                        if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+                                $class = ' class="current"';
+                        }
+
+                        $type_links[] = '<li><a href="' . esc_url(
+                                add_query_arg(
+                                        array(
+                                                'post_mime_type' => $mime_type,
+                                                'paged'          => false,
+                                        )
+                                )
+                        ) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
+                }
+                /**
+                 * Filters the media upload mime type list items.
+                 *
+                 * Returned values should begin with an `<li>` tag.
+                 *
+                 * @since 3.1.0
+                 *
+                 * @param string[] $type_links An array of list items containing mime type link HTML.
+                 */
+                echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
+                unset( $type_links );
                 ?>
-<select name='m'>
-<option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
+        </ul>
+
+        <div class="tablenav">
+
                 <?php
-                foreach ( $arc_result as $arc_row ) {
-                        if ( $arc_row->yyear == 0 ) {
-                                continue;
-                        }
-                        $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
-
-                        if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
-                                $default = ' selected="selected"';
-                        } else {
-                                $default = '';
-                        }
-
-                        echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
-                        echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
-                        echo "</option>\n";
+                $page_links = paginate_links(
+                        array(
+                                'base'      => add_query_arg( 'paged', '%#%' ),
+                                'format'    => '',
+                                'prev_text' => __( '&laquo;' ),
+                                'next_text' => __( '&raquo;' ),
+                                'total'     => ceil( $wp_query->found_posts / 10 ),
+                                'current'   => $q['paged'],
+                        )
+                );
+
+                if ( $page_links ) {
+                        echo "<div class='tablenav-pages'>$page_links</div>";
                 }
                 ?>
-</select>
-        <?php } ?>
-
-        <?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
-
-</div>
-
-<br class="clear" />
-</div>
-</form>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
-
+
+        <div class="alignleft actions">
+                <?php
+
+                $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
+
+                $arc_result = $wpdb->get_results( $arc_query );
+
+                $month_count    = count( $arc_result );
+                $selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
+
+                if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
+                        ?>
+                        <select name='m'>
+                        <option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
+                        <?php
+
+                        foreach ( $arc_result as $arc_row ) {
+                                if ( $arc_row->yyear == 0 ) {
+                                        continue;
+                                }
+
+                                $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
+
+                                if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
+                                        $default = ' selected="selected"';
+                                } else {
+                                        $default = '';
+                                }
+
+                                echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
+                                echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
+                                echo "</option>\n";
+                        }
+
+                        ?>
+                        </select>
+                <?php } ?>
+
+                <?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
+
+        </div>
+
+        <br class="clear" />
+        </div>
+        </form>
+
+        <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
         <?php wp_nonce_field( 'media-form' ); ?>
         <?php //media_upload_form( $errors ); ?>
 
-<script type="text/javascript">
-<!--
-jQuery(function($){
-        var preloaded = $(".media-item.preloaded");
-        if ( preloaded.length > 0 ) {
-                preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-                updateMediaForm();
-        }
-});
--->
-</script>
-
-<div id="media-items">
-        <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-        <?php echo get_media_items( null, $errors ); ?>
-</div>
-<p class="ml-submit">
-        <?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-</p>
-</form>
+        <script type="text/javascript">
+        jQuery(function($){
+                var preloaded = $(".media-item.preloaded");
+                if ( preloaded.length > 0 ) {
+                        preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+                        updateMediaForm();
+                }
+        });
+        </script>
+
+        <div id="media-items">
+                <?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+                <?php echo get_media_items( null, $errors ); ?>
+        </div>
+        <p class="ml-submit">
+                <?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
+        <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+        </p>
+        </form>
         <?php
 }
@@ -2770 +2871 @@
                         </th>
                         <td class="field"><textarea id="caption" name="caption"></textarea></td>
-                </tr>
-';
+                </tr>';
         } else {
                 $caption = '';
@@ -2777 +2877 @@
 
         $default_align = get_option( 'image_default_align' );
+
         if ( empty( $default_align ) ) {
                 $default_align = 'none';
@@ -2857 +2958 @@
                         </td>
                 </tr>
-        </tbody></table>
-';
-
+        </tbody></table>';
 }
 
@@ -2927 +3026 @@
                 $end = '</a>';
         }
+
         ?>
-<p class="hide-if-no-js"><label>
-<input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
+        <p class="hide-if-no-js"><label>
+        <input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
         <?php
         /* translators: 1: Link start tag, 2: Link end tag, 3: Width, 4: Height. */
         printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
+
         ?>
-</label></p>
+        </label></p>
         <?php
 }
@@ -2960 +3061 @@
 function edit_form_image_editor( $post ) {
         $open = isset( $_GET['image-editor'] );
+
         if ( $open ) {
                 require_once ABSPATH . 'wp-admin/includes/image-edit.php';
@@ -2966 +3068 @@
         $thumb_url     = false;
         $attachment_id = intval( $post->ID );
+
         if ( $attachment_id ) {
                 $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
@@ -2976 +3079 @@
         <div class="wp_attachment_holder wp-clearfix">
         <?php
+
         if ( wp_attachment_is_image( $post->ID ) ) :
                 $image_edit_button = '';
@@ -2985 +3089 @@
                 $open_style     = '';
                 $not_open_style = '';
+
                 if ( $open ) {
                         $open_style = ' style="display:none"';
@@ -2990 +3095 @@
                         $not_open_style = ' style="display:none"';
                 }
+
                 ?>
-
                 <div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
 
@@ -2999 +3104 @@
                 </div>
                 <div<?php echo $not_open_style; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
-                        <?php
-                        if ( $open ) {
-                                wp_image_editor( $attachment_id );}
-                        ?>
+                <?php
+
+                if ( $open ) {
+                        wp_image_editor( $attachment_id );
+                }
+
+                ?>
                 </div>
                 <?php
@@ -3018 +3126 @@
                 $w    = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0;
                 $h    = ! empty( $meta['height'] ) ? $meta['height'] : 0;
+
                 if ( $h && $w < $meta['width'] ) {
                         $h = round( ( $meta['height'] * $w ) / $meta['width'] );
@@ -3023 +3132 @@
 
                 $attr = array( 'src' => $att_url );
+
                 if ( ! empty( $w ) && ! empty( $h ) ) {
                         $attr['width']  = $w;
@@ -3029 +3139 @@
 
                 $thumb_id = get_post_thumbnail_id( $attachment_id );
+
                 if ( ! empty( $thumb_id ) ) {
                         $attr['poster'] = wp_get_attachment_url( $thumb_id );
@@ -3036 +3147 @@
 
         elseif ( isset( $thumb_url[0] ) ) :
-
                 ?>
                 <div class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
@@ -3057 +3167 @@
 
         endif;
+
         ?>
         </div>
@@ -3066 +3177 @@
                 </p>
                 <p class="attachment-alt-text-description" id="alt-text-description">
-                        <?php
-                        printf(
-                                /* translators: 1: Link to tutorial, 2: Additional link attributes, 3: Accessibility text. */
-                                __( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
-                                esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
-                                'target="_blank" rel="noopener noreferrer"',
-                                sprintf(
-                                        '<span class="screen-reader-text"> %s</span>',
-                                        /* translators: Accessibility text. */
-                                        __( '(opens in a new tab)' )
-                                )
-                        );
-                        ?>
+                <?php
+
+                printf(
+                        /* translators: 1: Link to tutorial, 2: Additional link attributes, 3: Accessibility text. */
+                        __( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
+                        esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
+                        'target="_blank" rel="noopener noreferrer"',
+                        sprintf(
+                                '<span class="screen-reader-text"> %s</span>',
+                                /* translators: Accessibility text. */
+                                __( '(opens in a new tab)' )
+                        )
+                );
+
+                ?>
                 </p>
         <?php endif; ?>
@@ -3088 +3201 @@
 
         <?php
-                $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-                $editor_args        = array(
-                        'textarea_name' => 'content',
-                        'textarea_rows' => 5,
-                        'media_buttons' => false,
-                        'tinymce'       => false,
-                        'quicktags'     => $quicktags_settings,
-                );
+
+        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
+        $editor_args        = array(
+                'textarea_name' => 'content',
+                'textarea_rows' => 5,
+                'media_buttons' => false,
+                'tinymce'       => false,
+                'quicktags'     => $quicktags_settings,
+        );
+
         ?>
 
         <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
-                <?php
-                if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
-                        echo ': ' . __( 'Displayed on attachment pages.' );
-                }
-                ?>
+        <?php
+
+        if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
+                echo ': ' . __( 'Displayed on attachment pages.' );
+        }
+
+        ?>
         </label>
         <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
@@ -3109 +3226 @@
         </div>
         <?php
+
         $extras = get_compat_media_markup( $post->ID );
         echo $extras['item'];
@@ -3120 +3238 @@
  */
 function attachment_submitbox_metadata() {
-        $post = get_post();
-
-        $file     = get_attached_file( $post->ID );
+        $post          = get_post();
+        $attachment_id = $post->ID;
+
+        $file     = get_attached_file( $attachment_id );
         $filename = esc_html( wp_basename( $file ) );
 
         $media_dims = '';
-        $meta       = wp_get_attachment_metadata( $post->ID );
+        $meta       = wp_get_attachment_metadata( $attachment_id );
+
         if ( isset( $meta['width'], $meta['height'] ) ) {
-                $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+                $media_dims .= "<span id='media-dims-$attachment_id'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
         }
         /** This filter is documented in wp-admin/includes/media.php */
         $media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
-        $att_url = wp_get_attachment_url( $post->ID );
+        $att_url = wp_get_attachment_url( $attachment_id );
+
         ?>
         <div class="misc-pub-section misc-pub-attachment">
@@ -3143 +3264 @@
         </div>
         <div class="misc-pub-section misc-pub-filetype">
-                <?php _e( 'File type:' ); ?> <strong>
-                                        <?php
-                                        if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
-                                                echo esc_html( strtoupper( $matches[1] ) );
-                                                list( $mime_type ) = explode( '/', $post->post_mime_type );
-                                                if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
-                                                        if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
-                                                                echo ' (' . $meta['mime_type'] . ')';
-                                                        }
-                                                }
-                                        } else {
-                                                echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
-                                        }
-                                        ?>
+                <?php _e( 'File type:' ); ?>
+                <strong>
+                <?php
+
+                if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
+                        echo esc_html( strtoupper( $matches[1] ) );
+                        list( $mime_type ) = explode( '/', $post->post_mime_type );
+                        if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
+                                if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
+                                        echo ' (' . $meta['mime_type'] . ')';
+                                }
+                        }
+                } else {
+                        echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
+                }
+
+                ?>
                 </strong>
         </div>
 
         <?php
-                $file_size = false;
+
+        $file_size = false;
 
         if ( isset( $meta['filesize'] ) ) {
@@ -3169 +3294 @@
         }
 
-        if ( ! empty( $file_size ) ) :
+        if ( ! empty( $file_size ) ) {
                 ?>
-                        <div class="misc-pub-section misc-pub-filesize">
-                                <?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
-                        </div>
-                        <?php
-                endif;
+                <div class="misc-pub-section misc-pub-filesize">
+                        <?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
+                </div>
+                <?php
+        }
 
         if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
@@ -3201 +3326 @@
                                 continue;
                         }
+
                         ?>
-                <div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-                        <?php echo $label; ?> <strong>
-                                                <?php
-                                                switch ( $key ) {
-                                                        case 'bitrate':
-                                                                echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
-                                                                if ( ! empty( $meta['bitrate_mode'] ) ) {
-                                                                        echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
-                                                                }
-                                                                break;
-                                                        default:
-                                                                echo esc_html( $meta[ $key ] );
-                                                                break;
+                        <div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+                                <?php echo $label; ?>
+                                <strong>
+                                <?php
+
+                                switch ( $key ) {
+                                        case 'bitrate':
+                                                echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
+                                                if ( ! empty( $meta['bitrate_mode'] ) ) {
+                                                        echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
                                                 }
-                                                ?>
-                        </strong>
-                </div>
+                                                break;
+                                        default:
+                                                echo esc_html( $meta[ $key ] );
+                                                break;
+                                }
+
+                                ?>
+                                </strong>
+                        </div>
                         <?php
                 }
@@ -3245 +3374 @@
                                 continue;
                         }
+
                         ?>
-                <div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-                        <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
+                        <div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+                                <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
+                        </div>
+                        <?php
+                }
+        }
+
+        if ( $media_dims ) {
+                ?>
+                <div class="misc-pub-section misc-pub-dimensions">
+                        <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
                 </div>
-                        <?php
-                }
-        }
-
-        if ( $media_dims ) :
-                ?>
-        <div class="misc-pub-section misc-pub-dimensions">
-                <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
-        </div>
                 <?php
-        endif;
+        }
 }
 
@@ -3329 +3459 @@
                 require( ABSPATH . WPINC . '/ID3/getid3.php' );
         }
+
         $id3  = new getID3();
         $data = $id3->analyze( $file );
@@ -3335 +3466 @@
                 $metadata['lossless'] = $data['video']['lossless'];
         }
+
         if ( ! empty( $data['video']['bitrate'] ) ) {
                 $metadata['bitrate'] = (int) $data['video']['bitrate'];
         }
+
         if ( ! empty( $data['video']['bitrate_mode'] ) ) {
                 $metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
         }
+
         if ( ! empty( $data['filesize'] ) ) {
                 $metadata['filesize'] = (int) $data['filesize'];
         }
+
         if ( ! empty( $data['mime_type'] ) ) {
                 $metadata['mime_type'] = $data['mime_type'];
         }
+
         if ( ! empty( $data['playtime_seconds'] ) ) {
                 $metadata['length'] = (int) round( $data['playtime_seconds'] );
         }
+
         if ( ! empty( $data['playtime_string'] ) ) {
                 $metadata['length_formatted'] = $data['playtime_string'];
         }
+
         if ( ! empty( $data['video']['resolution_x'] ) ) {
                 $metadata['width'] = (int) $data['video']['resolution_x'];
         }
+
         if ( ! empty( $data['video']['resolution_y'] ) ) {
                 $metadata['height'] = (int) $data['video']['resolution_y'];
         }
+
         if ( ! empty( $data['fileformat'] ) ) {
                 $metadata['fileformat'] = $data['fileformat'];
         }
+
         if ( ! empty( $data['video']['dataformat'] ) ) {
                 $metadata['dataformat'] = $data['video']['dataformat'];
         }
+
         if ( ! empty( $data['video']['encoder'] ) ) {
                 $metadata['encoder'] = $data['video']['encoder'];
         }
+
         if ( ! empty( $data['video']['codec'] ) ) {
                 $metadata['codec'] = $data['video']['codec'];
@@ -3417 +3560 @@
                 return false;
         }
+
         $metadata = array();
 
@@ -3426 +3570 @@
                 require( ABSPATH . WPINC . '/ID3/getid3.php' );
         }
+
         $id3  = new getID3();
         $data = $id3->analyze( $file );
@@ -3437 +3582 @@
                 $metadata['fileformat'] = $data['fileformat'];
         }
+
         if ( ! empty( $data['filesize'] ) ) {
                 $metadata['filesize'] = (int) $data['filesize'];
         }
+
         if ( ! empty( $data['mime_type'] ) ) {
                 $metadata['mime_type'] = $data['mime_type'];
         }
+
         if ( ! empty( $data['playtime_seconds'] ) ) {
                 $metadata['length'] = (int) round( $data['playtime_seconds'] );
         }
+
         if ( ! empty( $data['playtime_string'] ) ) {
                 $metadata['length_formatted'] = $data['playtime_string'];
@@ -3532 +3681 @@
                 wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
         }
+
         $ids = array();
+
         foreach ( (array) $_REQUEST['media'] as $att_id ) {
                 $att_id = (int) $att_id;
@@ -3545 +3696 @@
         if ( ! empty( $ids ) ) {
                 $ids_string = implode( ',', $ids );
+
                 if ( 'attach' === $action ) {
                         $result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) );
@@ -3559 +3711 @@
                 $location = 'upload.php';
                 $referer  = wp_get_referer();
+
                 if ( $referer ) {
                         if ( false !== strpos( $referer, 'upload.php' ) ) {
@@ -3567 +3720 @@
                 $key      = 'attach' === $action ? 'attached' : 'detach';
                 $location = add_query_arg( array( $key => $result ), $location );
+
                 wp_redirect( $location );
                 exit;

trunk/src/wp-includes/script-loader.php

@@ -1126 +1126 @@
                 'missing_upload_url'        => __( 'There was a configuration error. Please contact the server administrator.' ),
                 'upload_limit_exceeded'     => __( 'You may only upload 1 file.' ),
-                'http_error'                => __( 'HTTP error.' ),
+                'http_error'                => __( 'Unexpected response from the server. The file may have been uploaded successfully. Check in the Media Library or reload the page.' ),
+                'http_error_image'          => __( 'Post-processing of the image failed. If this is a photo or a large image, please scale it down to 2500px and upload it again.' ),
                 'upload_failed'             => __( 'Upload failed.' ),
                 /* translators: 1: Opening link tag, 2: Closing link tag. */