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

Editor: More strict checks for globals in render_block 

Props kraftbj.
Fixes #49927.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
gziolo 2020-07-01 06:08:06 +00:00
parent 083134f694
commit eeb4d75c57
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/blocks.php
View File

@ -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;

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.5-alpha-48242';
$wp_version = '5.5-alpha-48243';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.