WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Built from https://develop.svn.wordpress.org/branches/4.7@40084


git-svn-id: http://core.svn.wordpress.org/branches/4.7@40021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2017-02-20 06:35:48 +00:00
parent 5789e5f074
commit cb22496f4c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/js/wp-api.js
View File

@ -185,7 +185,7 @@
} else { } else {
// We already have args, merge these new args in. // 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 );
} }
} }
} else { } else {
@ -202,7 +202,7 @@
} else { } else {
// We already have options, merge these new args in. // 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 );
} }
} }

2
wp-includes/js/wp-api.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7.3-alpha-40083'; $wp_version = '4.7.3-alpha-40084';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.