Ticket #55448: 55448.diff

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

@@ -59 +59 @@
         public function widget( $args, $instance ) {
                 $instance = wp_parse_args( $instance, $this->default_instance );
 
-                echo str_replace(
-                        'widget_block',
-                        $this->get_dynamic_classname( $instance['content'] ),
-                        $args['before_widget']
-                );
-
                 /**
                  * Filters the content of the Block widget before output.
                  *
@@ -74 +68 @@
                  * @param array           $instance Array of settings for the current widget.
                  * @param WP_Widget_Block $widget   Current Block widget instance.
                  */
-                echo apply_filters(
+                $content = apply_filters(
                         'widget_block_content',
                         $instance['content'],
                         $instance,
                         $this
                 );
 
-                echo $args['after_widget'];
+                // only output content if it exists, this prevents empty boxes on pages.
+                if ( ! empty( $content ) ) {
+
+                        echo str_replace(
+                                'widget_block',
+                                $this->get_dynamic_classname( $instance['content'] ),
+                                $args['before_widget']
+                        );
+
+                        echo $content;
+
+                        echo $args['after_widget'];
+
+                }
+
         }
 
         /**