Ticket #22750: 22750.diff

wp-includes/js/media-models.js

@@ -263 +263 @@
                         // Overload the `delete` request so attachments can be removed.
                         // This will permanently delete an attachment.
                         } else if ( 'delete' === method ) {
+                                this.destroyed = true;
                                 options = options || {};
                                 options.context = this;
                                 options.data = _.extend( options.data || {}, {
@@ -270 +271 @@
                                         id:       this.id,
                                         _wpnonce: this.get('nonces')['delete']
                                 });
-                                return media.ajax( options );
+
+                                return media.ajax( options ).fail( function() {
+                                        this.destroyed = false;
+                                });
                         }
                 },
 
@@ -401 +405 @@
                         this.reset( this._source.filter( this.validator, this ) );
                 },
 
+                validateDestroyed: false,
+
                 validator: function( attachment ) {
+                        if ( ! this.validateDestroyed && attachment.destroyed )
+                                return false;
                         return _.all( this.filters, function( filter, key ) {
                                 return !! filter.call( this, attachment );
                         }, this );