Changeset 45265

Timestamp:

04/24/2019 09:38:21 PM (5 years ago)

Author:

azaozz

Message:

Fix parsing of inner blocks when auto-generating an excerpt. Helps to prevent cases where dynamic inner blocks may cause an infinite loop if trying to auto-generate an excerpt.

Props desrosj, pento, gziolo, azaozz.
Fixes #46133.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (3 diffs)
• tests/phpunit/tests/formatting/ExcerptRemoveBlocks.php (added)

trunk/src/wp-includes/blocks.php

@@ -126 +126 @@
  */
 function excerpt_remove_blocks( $content ) {
-    $allowed_blocks = array(
+    $allowed_inner_blocks = array(
         // Classic blocks have their blockName set to null.
         null,
-        'core/columns',
         'core/freeform',
         'core/heading',
@@ -142 +141 @@
         'core/verse',
     );
+
+    $allowed_blocks = array_merge( $allowed_inner_blocks, array( 'core/columns' ) );
+
     /**
      * Filters the list of blocks that can contribute to the excerpt.
@@ -155 +157 @@
     $blocks         = parse_blocks( $content );
     $output         = '';
+
     foreach ( $blocks as $block ) {
         if ( in_array( $block['blockName'], $allowed_blocks, true ) ) {
+            if ( ! empty( $block['innerBlocks'] ) ) {
+                if ( 'core/columns' === $block['blockName'] ) {
+                    $output .= _excerpt_render_inner_columns_blocks( $block, $allowed_inner_blocks );
+                    continue;
+                }
+
+                // Skip the block if it has disallowed or nested inner blocks.
+                foreach ( $block['innerBlocks'] as $inner_block ) {
+                    if (
+                        ! in_array( $inner_block['blockName'], $allowed_inner_blocks, true ) ||
+                        ! empty( $inner_block['innerBlocks'] )
+                    ) {
+                        continue 2;
+                    }
+                }
+            }
+
             $output .= render_block( $block );
         }
     }
-     return $output;
+
+    return $output;
+}
+
+/**
+ * Render inner blocks from the `core/columns` block for generating an excerpt.
+ *
+ * @since 5.2.0
+ * @access private
+ *
+ * @param array $columns        The parsed columns block.
+ * @param array $allowed_blocks The list of allowed inner blocks.
+ * @return string The rendered inner blocks.
+ */
+function _excerpt_render_inner_columns_blocks( $columns, $allowed_blocks ) {
+    $output = '';
+
+    foreach ( $columns['innerBlocks'] as $column ) {
+        foreach ( $column['innerBlocks'] as $inner_block ) {
+            if ( in_array( $inner_block['blockName'], $allowed_blocks, true ) && empty( $inner_block['innerBlocks'] ) ) {
+                $output .= render_block( $inner_block );
+            }
+        }
+    }
+
+    return $output;
 }