Changeset 54335 for trunk/src/wp-includes/blocks/comment-template.php

Timestamp:

09/27/2022 05:30:41 PM (4 years ago)

Author:

hellofromTonya

Message:

Editor: Update packages for 6.1 Beta 2.

Package updates for bug and regression fixes:

• @wordpress/block-directory: 3.15.3
• @wordpress/block-editor: 10.0.3
• @wordpress/block-library: 7.14.3
• @wordpress/block-serialization-default-parser: 4.17.1
• @wordpress/blocks: 11.16.3
• @wordpress/components: 21.0.3
• @wordpress/compose: 5.15.2
• @wordpress/core-data: 5.0.3
• @wordpress/customize-widgets: 3.14.3
• @wordpress/edit-post: 6.14.3
• @wordpress/edit-site: 4.14.4
• @wordpress/edit-widgets: 4.14.3
• @wordpress/editor: 12.16.3
• @wordpress/format-library: 3.15.3
• @wordpress/interface: 4.16.3
• @wordpress/list-reusable-blocks: 3.15.3
• @wordpress/nux: 5.15.3
• @wordpress/preferences: 2.9.3
• @wordpress/reusable-blocks: 3.15.3
• @wordpress/server-side-render: 3.15.3
• @wordpress/style-engine: 1.0.2
• @wordpress/widgets: 2.15.3

References:

• ​Gutenberg PR 44233 – Blocks: Fix searching of blocks when description is non-string
• ​Gutenberg PR 44301 – Block Toolbar: update position when moving blocks
• ​Gutenberg PR 44334 – Global Styles: Re-add styles that were removed, for classic themes
• ​Gutenberg PR 44351 – Comments block: Support nested comments settings in the comments blocks
• ​Gutenberg PR 44448 – Add a correct TS signature for useEntityRecords
• ​Gutenberg PR 44315 – Pullquote: fix transform to quote crash
• ​Gutenberg PR 44446 – Fix spacing property generation in flow layout type.
• ​Gutenberg PR 44408 – Upgrade react-easy-crop to bring in fix for site editor iframe
• ​Gutenberg PR 44406 – Style engine: kebab case preset slugs in the editor
• ​Gutenberg PR 44209 – Fixing padding on the post editor when RootPaddingAwareAlignments setting is enabled
• ​Gutenberg PR 42950 – Popover: fix limitShift logic by adding iframe offset correctly (and a custom shift limiter)
• ​Gutenberg PR 44337 – Submenu block href only if url is not empty
• ​Gutenberg PR 44291 – Add role=application to list view to prevent browse mode triggering in NVDA
• ​Gutenberg PR 44283 – Navigation block: Fix submenu colors for imported classic menus
• ​Gutenberg PR 44282 – Fix popover stacking in the customize widgets editor
• ​Gutenberg PR 44247 – Spacing presets: switch to using numbers instead of t-shirt sizes for labels
• ​Gutenberg PR 44299 – Backport template creation changes from core
• ​Gutenberg PR 44294 – [Block Library - Query Loop]: Fix broken preview in specific category template
• ​Gutenberg PR 44287 – [Block Library]: Rename Comments pagination inner blocks
• ​Gutenberg PR 44256 – Avoid showing the recursion warning in previews when replacing template parts
• ​Gutenberg PR 44265 – Blocks: officially deprecated the children and node matchers
• ​Gutenberg PR 44251 – Global styles: Remove the beta label from global styles header

Props bernhard-reiter, cbravobernal.
See #56467.

File:

• trunk/src/wp-includes/blocks/comment-template.php (modified) (2 diffs)

trunk/src/wp-includes/blocks/comment-template.php

@@ -17 +17 @@
 function block_core_comment_template_render_comments( $comments, $block ) {
         global $comment_depth;
+        $thread_comments       = get_option( 'thread_comments' );
+        $thread_comments_depth = get_option( 'thread_comments_depth' );
 
         if ( empty( $comment_depth ) ) {
@@ -47 +49 @@
                 // If the comment has children, recurse to create the HTML for the nested
                 // comments.
-                if ( ! empty( $children ) ) {
-                        $comment_depth += 1;
-                        $inner_content  = block_core_comment_template_render_comments(
-                                $children,
-                                $block
-                        );
-                        $block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
-                        $comment_depth -= 1;
+                if ( ! empty( $children ) && ! empty( $thread_comments ) ) {
+                        if ( $comment_depth < $thread_comments_depth ) {
+                                $comment_depth += 1;
+                                $inner_content  = block_core_comment_template_render_comments(
+                                        $children,
+                                        $block
+                                );
+                                $block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
+                                $comment_depth -= 1;
+                        } else {
+                                $inner_content  = block_core_comment_template_render_comments(
+                                        $children,
+                                        $block
+                                );
+                                $block_content .= sprintf( $inner_content );
+                        }
                 }