Changeset 40084 for branches/4.7

Timestamp:

02/20/2017 06:34:17 AM (8 years ago)

Author:

dd32

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, adamsilverstein.
Merges [40040] to the 4.7 branch.
Fixes #39341.

Location:

branches/4.7

Files:

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

branches/4.7/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 );
                         }
                     }