From abbc108d197149d2a43360f53cebc54f4a2b8257 Mon Sep 17 00:00:00 2001 From: TimothyBlynJacobs Date: Sat, 24 Oct 2020 14:12:05 +0000 Subject: [PATCH] REST API: Make template handling resilient against plugins setting the global post. Plugins shouldn't be setting the global post object during a REST API request, but if they did this could cause unexpected errors when creating a post with a template. Props Kipperlenny, TimothyBlynJacobs. Fixes #49695. Built from https://develop.svn.wordpress.org/trunk@49301 git-svn-id: http://core.svn.wordpress.org/trunk@49063 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../rest-api/endpoints/class-wp-rest-posts-controller.php | 4 +++- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php index 06db540af2..e4a8bcba86 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php @@ -1344,8 +1344,10 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } if ( $request['id'] ) { + $post = get_post( $request['id'] ); $current_template = get_page_template_slug( $request['id'] ); } else { + $post = null; $current_template = ''; } @@ -1355,7 +1357,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller { } // If this is a create request, get_post() will return null and wp theme will fallback to the passed post type. - $allowed_templates = wp_get_theme()->get_page_templates( get_post( $request['id'] ), $this->post_type ); + $allowed_templates = wp_get_theme()->get_page_templates( $post, $this->post_type ); if ( isset( $allowed_templates[ $template ] ) ) { return true; diff --git a/wp-includes/version.php b/wp-includes/version.php index e096c3a327..1e1aa02e41 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-beta1-49300'; +$wp_version = '5.6-beta1-49301'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.