From 38b205e5dce50eaca92dffb46ef618cc2ee63ca7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 28 Jan 2021 10:35:59 +0000
Subject: [PATCH] Coding Standards: Simplify a long condition in
 `WP_Site_Health_Auto_Updates::test_wp_version_check_attached()` for better
 readability.

Follow-up to [50035].

See #52135.
Built from https://develop.svn.wordpress.org/trunk@50049


git-svn-id: http://core.svn.wordpress.org/trunk@49750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../class-wp-site-health-auto-updates.php       |  4 +++-
 wp-includes/blocks/freeform/block.json          | 17 +++++++++++++++++
 wp-includes/version.php                         |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 wp-includes/blocks/freeform/block.json

diff --git a/wp-admin/includes/class-wp-site-health-auto-updates.php b/wp-admin/includes/class-wp-site-health-auto-updates.php
index 33003a1c89..11d2c2fb48 100644
--- a/wp-admin/includes/class-wp-site-health-auto-updates.php
+++ b/wp-admin/includes/class-wp-site-health-auto-updates.php
@@ -90,7 +90,9 @@ class WP_Site_Health_Auto_Updates {
 	 * @return array The test results.
 	 */
 	public function test_wp_version_check_attached() {
-		if ( ( ! is_multisite() || ( is_main_site() && is_network_admin() ) ) && ! has_filter( 'wp_version_check', 'wp_version_check' ) ) {
+		if ( ( ! is_multisite() || is_main_site() && is_network_admin() )
+			&& ! has_filter( 'wp_version_check', 'wp_version_check' )
+		) {
 			return array(
 				'description' => sprintf(
 					/* translators: %s: Name of the filter used. */
diff --git a/wp-includes/blocks/freeform/block.json b/wp-includes/blocks/freeform/block.json
new file mode 100644
index 0000000000..a18cd84635
--- /dev/null
+++ b/wp-includes/blocks/freeform/block.json
@@ -0,0 +1,17 @@
+{
+	"apiVersion": 2,
+	"name": "core/freeform",
+	"category": "text",
+	"attributes": {
+		"content": {
+			"type": "string",
+			"source": "html"
+		}
+	},
+	"supports": {
+		"className": false,
+		"customClassName": false,
+		"reusable": false
+	},
+	"editorStyle": "wp-block-freeform-editor"
+}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f0d4e85761..3152682fc7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-50048';
+$wp_version = '5.7-alpha-50049';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.