Ticket #51566: 51566.diff

src/wp-includes/class-wp-embed.php

@@ -31 +31 @@
                 // Hack to get the [embed] shortcode to run before wpautop().
                 add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );
                 add_filter( 'widget_text_content', array( $this, 'run_shortcode' ), 8 );
+                add_filter( 'widget_block_content', array( $this, 'run_shortcode' ), 8 );
 
                 // Shortcode placeholder for strip_shortcodes().
                 add_shortcode( 'embed', '__return_false' );
@@ -38 +39 @@
                 // Attempts to embed all URLs in a post.
                 add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
                 add_filter( 'widget_text_content', array( $this, 'autoembed' ), 8 );
+                add_filter( 'widget_block_content', array( $this, 'autoembed' ), 8 );
 
                 // After a post is saved, cache oEmbed items via Ajax.
                 add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );

src/wp-includes/default-filters.php

@@ -214 +214 @@
 add_filter( 'widget_text_content', 'wp_replace_insecure_home_url' );
 add_filter( 'widget_text_content', 'do_shortcode', 11 ); // Runs after wpautop(); note that $post global will be null when shortcodes run.
 
+add_filter( 'widget_block_content', 'do_blocks', 9 );
+add_filter( 'widget_block_content', 'do_shortcode', 11 );
+
 add_filter( 'wp_get_custom_css', 'wp_replace_insecure_home_url' );
 
 // RSS filters.

src/wp-includes/widgets/class-wp-widget-block.php

@@ -66 +66 @@
                         $args['before_widget']
                 );
 
-                // Handle embeds for block widgets.
-                //
-                // When this feature is added to core it may need to be implemented
-                // differently. WP_Widget_Text is a good reference, that applies a
-                // filter for its content, which WP_Embed uses in its constructor.
-                // See https://core.trac.wordpress.org/ticket/51566.
-                global $wp_embed;
-                $content = $wp_embed->run_shortcode( $instance['content'] );
-                $content = $wp_embed->autoembed( $content );
-
-                $content = do_blocks( $content );
-                $content = do_shortcode( $content );
-
-                echo $content;
+                /**
+                 * Filters the content of the Block widget before output.
+                 *
+                 * @since 5.8.0
+                 *
+                 * @param string         $content  The widget content.
+                 * @param array          $instance Array of settings for the current widget.
+                 * @param WP_Widget_Text $widget   Current Block widget instance.
+                 */
+                echo apply_filters(
+                        'widget_block_content',
+                        $instance['content'],
+                        $instance,
+                        $this
+                );
 
                 echo $args['after_widget'];
         }