Changeset 40040 for trunk

Timestamp:

02/03/2017 09:45:06 PM (10 years ago)

Author:

adamsilverstein

Message:

REST API: JavaScript client should use _.extend when merging objects.

Correct an issue during the client's dynamic route discovery in wp.api.utils.decorateFromRoute where _.union potentially failed if used on objects.

Props ketuchetan.
Fixes #39341.

File:

• trunk/src/wp-includes/js/wp-api.js (modified) (2 diffs)

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

@@ -186 +186 @@
 
                                                 // We already have args, merge these new args in.
-                                                modelInstance.prototype.args = _.union( routeEndpoint.args, modelInstance.prototype.defaults );
+                                                modelInstance.prototype.args = _.extend( modelInstance.prototype.args, routeEndpoint.args );
                                         }
                                 }
@@ -203 +203 @@
 
                                                         // We already have options, merge these new args in.
-                                                        modelInstance.prototype.options = _.union( routeEndpoint.args, modelInstance.prototype.options );
+                                                        modelInstance.prototype.options = _.extend( modelInstance.prototype.options, routeEndpoint.args );
                                                 }
                                         }