Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync packages for WP 6.1 Beta 2 #3345

Closed
wants to merge 1 commit into from
Closed

Sync packages for WP 6.1 Beta 2 #3345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
951 changes: 547 additions & 404 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,56 +81,56 @@
"@wordpress/api-fetch": "6.14.1",
"@wordpress/autop": "3.17.1",
"@wordpress/blob": "3.17.1",
"@wordpress/block-directory": "3.15.2",
"@wordpress/block-editor": "10.0.2",
"@wordpress/block-library": "7.14.2",
"@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.2",
"@wordpress/components": "21.0.2",
"@wordpress/blocks": "11.16.3",
"@wordpress/components": "21.0.3",
"@wordpress/compose": "5.15.2",
"@wordpress/core-data": "5.0.2",
"@wordpress/customize-widgets": "3.14.2",
"@wordpress/core-data": "5.0.3",
"@wordpress/customize-widgets": "3.14.3",
"@wordpress/data": "7.1.2",
"@wordpress/data-controls": "2.17.2",
"@wordpress/date": "4.17.1",
"@wordpress/deprecated": "3.17.1",
"@wordpress/dom": "3.17.2",
"@wordpress/dom-ready": "3.17.1",
"@wordpress/edit-post": "6.14.2",
"@wordpress/edit-site": "4.14.2",
"@wordpress/edit-widgets": "4.14.2",
"@wordpress/editor": "12.16.2",
"@wordpress/edit-post": "6.14.3",
"@wordpress/edit-site": "4.14.4",
"@wordpress/edit-widgets": "4.14.3",
"@wordpress/editor": "12.16.3",
"@wordpress/element": "4.15.1",
"@wordpress/escape-html": "2.17.1",
"@wordpress/format-library": "3.15.2",
"@wordpress/format-library": "3.15.3",
"@wordpress/hooks": "3.17.1",
"@wordpress/html-entities": "3.17.1",
"@wordpress/i18n": "4.17.1",
"@wordpress/icons": "9.8.1",
"@wordpress/interface": "4.16.2",
"@wordpress/interface": "4.16.3",
"@wordpress/is-shallow-equal": "4.17.1",
"@wordpress/keyboard-shortcuts": "3.15.2",
"@wordpress/keycodes": "3.17.1",
"@wordpress/list-reusable-blocks": "3.15.2",
"@wordpress/list-reusable-blocks": "3.15.3",
"@wordpress/media-utils": "4.8.1",
"@wordpress/notices": "3.17.2",
"@wordpress/nux": "5.15.2",
"@wordpress/nux": "5.15.3",
"@wordpress/plugins": "4.15.2",
"@wordpress/preferences": "2.9.2",
"@wordpress/preferences": "2.9.3",
"@wordpress/preferences-persistence": "1.9.1",
"@wordpress/primitives": "3.15.1",
"@wordpress/priority-queue": "2.17.2",
"@wordpress/redux-routine": "4.17.1",
"@wordpress/reusable-blocks": "3.15.2",
"@wordpress/reusable-blocks": "3.15.3",
"@wordpress/rich-text": "5.15.2",
"@wordpress/server-side-render": "3.15.2",
"@wordpress/server-side-render": "3.15.3",
"@wordpress/shortcode": "3.17.1",
"@wordpress/style-engine": "1.0.1",
"@wordpress/style-engine": "1.0.2",
"@wordpress/token-list": "2.17.1",
"@wordpress/url": "3.18.1",
"@wordpress/viewport": "4.15.2",
"@wordpress/warning": "2.17.1",
"@wordpress/widgets": "2.15.2",
"@wordpress/widgets": "2.15.3",
"@wordpress/wordcount": "3.17.1",
"backbone": "1.4.1",
"clipboard": "2.0.10",
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/assets/script-loader-packages.min.php
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/wp-includes/blocks/blocks-json.php
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 18 additions & 8 deletions src/wp-includes/blocks/comment-template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
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 ) ) {
$comment_depth = 1;
Expand Down Expand Up @@ -46,14 +48,22 @@ function block_core_comment_template_render_comments( $comments, $block ) {

// 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 );
}
}

$content .= sprintf( '<li id="comment-%1$s" %2$s>%3$s</li>', $comment->comment_ID, $comment_classes, $block_content );
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/blocks/comments-pagination-next/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://schemas.wp.org/trunk/block.json",
"apiVersion": 2,
"name": "core/comments-pagination-next",
"title": "Next Page",
"title": "Comments Next Page",
"category": "theme",
"parent": [ "core/comments-pagination" ],
"description": "Displays the next comment's page link.",
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/blocks/comments-pagination-numbers/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://schemas.wp.org/trunk/block.json",
"apiVersion": 2,
"name": "core/comments-pagination-numbers",
"title": "Page Numbers",
"title": "Comments Page Numbers",
"category": "theme",
"parent": [ "core/comments-pagination" ],
"description": "Displays a list of page numbers for comments pagination.",
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/blocks/comments-pagination-previous/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://schemas.wp.org/trunk/block.json",
"apiVersion": 2,
"name": "core/comments-pagination-previous",
"title": "Previous Page",
"title": "Comments Previous Page",
"category": "theme",
"parent": [ "core/comments-pagination" ],
"description": "Displays the previous comment's page link.",
Expand Down
11 changes: 10 additions & 1 deletion src/wp-includes/blocks/navigation-submenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,16 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
if ( ! $open_on_click ) {
$item_url = isset( $attributes['url'] ) ? $attributes['url'] : '';
// Start appending HTML attributes to anchor tag.
$html .= '<a class="wp-block-navigation-item__content" href="' . esc_url( $item_url ) . '"';
$html .= '<a class="wp-block-navigation-item__content"';

// The href attribute on a and area elements is not required;
// when those elements do not have href attributes they do not create hyperlinks.
// But also The href attribute must have a value that is a valid URL potentially
// surrounded by spaces.
// see: https://html.spec.whatwg.org/multipage/links.html#links-created-by-a-and-area-elements.
if ( ! empty( $item_url ) ) {
$html .= ' href="' . esc_url( $item_url ) . '"';
}

if ( $is_active ) {
$html .= ' aria-current="page"';
Expand Down