From 345549a412e7011060e3c5ee69571bf704dce78b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 30 Jun 2020 11:16:00 +0000
Subject: [PATCH] Docs: Correct `$wp_query` global reference in
 `render_block()`.

See #49927, #49572.
Built from https://develop.svn.wordpress.org/trunk@48226


git-svn-id: http://core.svn.wordpress.org/trunk@47995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/blocks.php  | 14 +++++++-------
 wp-includes/version.php |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php
index 4881ab4d87..0e6b6a63f4 100644
--- a/wp-includes/blocks.php
+++ b/wp-includes/blocks.php
@@ -649,8 +649,8 @@ function _excerpt_render_inner_columns_blocks( $columns, $allowed_blocks ) {
  *
  * @since 5.0.0
  *
- * @global WP_Post  $post         The post to edit.
- * @global WP_Query $wp_the_query WordPress Query object.
+ * @global WP_Post  $post     The post to edit.
+ * @global WP_Query $wp_query WordPress Query object.
  *
  * @param array $parsed_block A single parsed block object.
  * @return string String of rendered HTML.
@@ -689,11 +689,11 @@ function render_block( $parsed_block ) {
 		$context['postId'] = $post->ID;
 
 		/*
-		* The `postType` context is largely unnecessary server-side, since the
-		* ID is usually sufficient on its own. That being said, since a block's
-		* manifest is expected to be shared between the server and the client,
-		* it should be included to consistently fulfill the expectation.
-		*/
+		 * The `postType` context is largely unnecessary server-side, since the ID
+		 * is usually sufficient on its own. That being said, since a block's
+		 * manifest is expected to be shared between the server and the client,
+		 * it should be included to consistently fulfill the expectation.
+		 */
 		$context['postType'] = $post->post_type;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4abd30c3b8..87a4e8f070 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48225';
+$wp_version = '5.5-alpha-48226';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.