From 8f37ef9daa9231339288ef438039987ca826bf1f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 4 Jul 2022 18:15:15 +0000
Subject: [PATCH] Docs: Update the version in which Meetup.com was removed as
 an oEmbed source.

Meetup.com was previously removed as an oEmbed source, since they have deprecated their endpoint. The block has also been removed from the editor, see #GB35085.

This commit updates the associated changelog entry for the `oembed_providers` filter to version 6.0.1, as the change is being backported to the 6.0 branch.

Follow-up to [53540].

See #55997.
Built from https://develop.svn.wordpress.org/trunk@53646


git-svn-id: http://core.svn.wordpress.org/trunk@53205 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/blocks/cover.php    | 15 +++++++++------
 wp-includes/class-wp-oembed.php |  4 ++--
 wp-includes/version.php         |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/wp-includes/blocks/cover.php b/wp-includes/blocks/cover.php
index fc1aed7b96..9e14791ba8 100644
--- a/wp-includes/blocks/cover.php
+++ b/wp-includes/blocks/cover.php
@@ -32,12 +32,15 @@ function render_block_core_cover( $attributes, $content ) {
 
 		$image = get_the_post_thumbnail( null, 'post-thumbnail', $attr );
 
-		$content = str_replace(
-			'</span><div',
-			'</span>' . $image . '<div',
-			$content
-		);
-
+		/*
+		 * Inserts the featured image between the (1st) cover 'background' `span` and 'inner_container' `div`,
+		 * and removes eventual withespace characters between the two (typically introduced at template level)
+		 */
+		$inner_container_start = '/<div\b[^>]+wp-block-cover__inner-container[\s|"][^>]*>/U';
+		if ( 1 === preg_match( $inner_container_start, $content, $matches, PREG_OFFSET_CAPTURE ) ) {
+			$offset  = $matches[0][1];
+			$content = substr( $content, 0, $offset ) . $image . substr( $content, $offset );
+		}
 	} else {
 		if ( in_the_loop() ) {
 			update_post_thumbnail_cache();
diff --git a/wp-includes/class-wp-oembed.php b/wp-includes/class-wp-oembed.php
index 321f25c40f..4e83bc75da 100644
--- a/wp-includes/class-wp-oembed.php
+++ b/wp-includes/class-wp-oembed.php
@@ -202,8 +202,8 @@ class WP_oEmbed {
 		 * | Instagram TV | instagram.com        | 5.1.0     | 5.5.2     |
 		 * | Instagram TV | instagr.am           | 5.1.0     | 5.5.2     |
 		 * | Facebook     | facebook.com         | 4.7.0     | 5.5.2     |
-		 * | Meetup.com   | meetup.com           | 3.9.0     | 6.1.0     |
-		 * | Meetup.com   | meetu.ps             | 3.9.0     | 6.1.0     |
+		 * | Meetup.com   | meetup.com           | 3.9.0     | 6.0.1     |
+		 * | Meetup.com   | meetu.ps             | 3.9.0     | 6.0.1     |
 		 *
 		 * @see wp_oembed_add_provider()
 		 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 33c629da43..8da33a154d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53644';
+$wp_version = '6.1-alpha-53646';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.