From ac7c4e270bc8623a988ca5f7e1c7d5742dfe32bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Zi=C3=83=C2=B3=C3=85=E2=80=9Akowski?= Date: Wed, 1 Jul 2020 06:06:39 +0000 Subject: [PATCH] Editor: More strict checks for globals in render_block Props kraftbj. Fixes #49927. git-svn-id: https://develop.svn.wordpress.org/trunk@48243 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/blocks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 0e6b6a63f4..2eec688b75 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -685,7 +685,7 @@ function render_block( $parsed_block ) { $context = array(); - if ( ! empty( $post ) ) { + if ( $post instanceof WP_Post ) { $context['postId'] = $post->ID; /* @@ -697,7 +697,7 @@ function render_block( $parsed_block ) { $context['postType'] = $post->post_type; } - if ( isset( $wp_query->tax_query->queried_terms['category'] ) ) { + if ( $wp_query instanceof WP_Query && isset( $wp_query->tax_query->queried_terms['category'] ) ) { $context['query'] = array( 'categoryIds' => array() ); foreach ( $wp_query->tax_query->queried_terms['category']['terms'] as $category_slug_or_id ) { $context['query']['categoryIds'][] = 'slug' === $wp_query->tax_query->queried_terms['category']['field'] ? get_cat_ID( $category_slug_or_id ) : $category_slug_or_id;