Ticket #40672: 40672.4.diff

src/wp-includes/js/wp-api.js

@@ -811 +811 @@
         wp.api.WPApiBaseModel = Backbone.Model.extend(
                 /** @lends WPApiBaseModel.prototype  */
                 {
-                        initialize: function( attributes, options ) {
-
-                                /**
-                                 * Determine if a model requires ?force=true to actually delete them.
-                                 */
-                                if (
-                                        ! _.isEmpty(
-                                                _.filter(
-                                                        this.endpoints,
-                                                        function( endpoint ) {
-                                                                return (
-
-                                                                        // Does the method support DELETE?
-                                                                        'DELETE' === endpoint.methods[0] &&
-
-                                                                        // Exclude models that support trash (Post, Page).
-                                                                        (
-                                                                                ! _.isUndefined( endpoint.args.force ) &&
-                                                                                ! _.isUndefined( endpoint.args.force.description ) &&
-                                                                                'Whether to bypass trash and force deletion.' !== endpoint.args.force.description
-                                                                        )
-                                                                );
-                                                        }
-                                                )
-                                        )
-                                ) {
-                                        this.requireForceForDelete = true;
-                                }
-                        },
 
                         /**
                          * Set nonce header before every Backbone sync.
@@ -1238 +1209 @@
                                 }
                         },
 
-                        modelEndpoints = routeModel.get( 'modelEndpoints' ),
-                        modelRegex     = new RegExp( '(?:.*[+)]|\/(' + modelEndpoints.join( '|' ) + '))$' );
+                        modelEndpoints  = routeModel.get( 'modelEndpoints' ),
+                        modelRegex      = new RegExp( '(?:.*[+)]|\/(' + modelEndpoints.join( '|' ) + '))$' ),
+                        trashableTypes  = [ 'Comment', 'Media', 'Comment', 'Post', 'Page', 'Status', 'Taxonomy', 'Type' ],
+                        modelInitialize = function() {
+
+                                /**
+                                * Types that don't support trashing require passing ?force=true to delete.
+                                *
+                                */
+                                if ( -1 === _.indexOf( trashableTypes, this.name ) ) {
+                                        this.requireForceForDelete = true;
+                                }
+                        };
 
                         /**
                          * Iterate thru the routes, picking up models and collections to build. Builds two arrays,
@@ -1337 +1319 @@
                                                 // Include the array of route methods for easy reference.
                                                 methods: modelRoute.route.methods,
 
+                                                // Initialize the model.
+                                                initialize: modelInitialize,
+
                                                 // Include the array of route endpoints for easy reference.
                                                 endpoints: modelRoute.route.endpoints
                                         } );
@@ -1375 +1360 @@
                                                 // Include the array of route methods for easy reference.
                                                 methods: modelRoute.route.methods,
 
+                                                // Initialize the model.
+                                                initialize: modelInitialize,
+
                                                 // Include the array of route endpoints for easy reference.
                                                 endpoints: modelRoute.route.endpoints
                                         } );