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

REST API: Avoid undefined-property notice when setting parent term to 0. 

Only try to access `term_id` once `$parent_term` is known to be a `WP_Term`.

Props dlh, earnjam.
Fixes #44983.

Built from https://develop.svn.wordpress.org/trunk@44965


git-svn-id: http://core.svn.wordpress.org/trunk@44796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
K. Adam White 2019-03-21 18:59:52 +00:00
parent 03bd75f053
commit fac9f5f9fb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
View File

@ -686,11 +686,15 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
if ( isset( $request['parent'] ) && ! empty( $schema['properties']['parent'] ) ) { if ( isset( $request['parent'] ) && ! empty( $schema['properties']['parent'] ) ) {
$parent_term_id = 0; $parent_term_id = 0;
$parent_term = get_term( (int) $request['parent'], $this->taxonomy ); $requested_parent = (int) $request['parent'];
if ( $parent_term ) { if ( $requested_parent ) {
$parent_term = get_term( $requested_parent, $this->taxonomy );
if ( $parent_term instanceof WP_Term ) {
$parent_term_id = $parent_term->term_id; $parent_term_id = $parent_term->term_id;
} }
}
$prepared_term->parent = $parent_term_id; $prepared_term->parent = $parent_term_id;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.2-alpha-44964'; $wp_version = '5.2-alpha-44965';
/** /**
* 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.