Skip to content

Commit 2ded522

Browse files
committed
Merge remote-tracking branch 'upstream/trunk' into html-api/add-table-support
2 parents 9c59014 + b64a068 commit 2ded522

123 files changed

Lines changed: 1987 additions & 1357 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package-lock.json

Lines changed: 206 additions & 206 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"@playwright/test": "1.45.0",
2929
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
3030
"@wordpress/babel-preset-default": "8.0.1",
31-
"@wordpress/dependency-extraction-webpack-plugin": "6.0.1",
31+
"@wordpress/dependency-extraction-webpack-plugin": "6.0.2",
3232
"@wordpress/e2e-test-utils": "11.0.1",
3333
"@wordpress/e2e-test-utils-playwright": "1.0.1",
3434
"@wordpress/prettier-config": "4.0.1",
35-
"@wordpress/scripts": "28.0.1",
35+
"@wordpress/scripts": "28.0.2",
3636
"autoprefixer": "10.4.19",
3737
"chalk": "5.3.0",
3838
"check-node-version": "4.2.1",
@@ -83,31 +83,31 @@
8383
"@wordpress/api-fetch": "7.0.1",
8484
"@wordpress/autop": "4.0.1",
8585
"@wordpress/blob": "4.0.1",
86-
"@wordpress/block-directory": "5.0.5",
87-
"@wordpress/block-editor": "13.0.4",
88-
"@wordpress/block-library": "9.0.5",
86+
"@wordpress/block-directory": "5.0.7",
87+
"@wordpress/block-editor": "13.0.5",
88+
"@wordpress/block-library": "9.0.6",
8989
"@wordpress/block-serialization-default-parser": "5.0.1",
9090
"@wordpress/blocks": "13.0.3",
9191
"@wordpress/commands": "1.0.3",
9292
"@wordpress/components": "28.0.3",
9393
"@wordpress/compose": "7.0.1",
94-
"@wordpress/core-commands": "1.0.4",
95-
"@wordpress/core-data": "7.0.4",
96-
"@wordpress/customize-widgets": "5.0.5",
94+
"@wordpress/core-commands": "1.0.5",
95+
"@wordpress/core-data": "7.0.5",
96+
"@wordpress/customize-widgets": "5.0.6",
9797
"@wordpress/data": "10.0.2",
9898
"@wordpress/data-controls": "4.0.2",
9999
"@wordpress/dataviews": "2.0.4",
100100
"@wordpress/date": "5.0.1",
101101
"@wordpress/deprecated": "4.0.1",
102102
"@wordpress/dom": "4.0.1",
103103
"@wordpress/dom-ready": "4.0.1",
104-
"@wordpress/edit-post": "8.0.5",
105-
"@wordpress/edit-site": "6.0.5",
106-
"@wordpress/edit-widgets": "6.0.5",
107-
"@wordpress/editor": "14.0.4",
104+
"@wordpress/edit-post": "8.0.7",
105+
"@wordpress/edit-site": "6.0.7",
106+
"@wordpress/edit-widgets": "6.0.6",
107+
"@wordpress/editor": "14.0.6",
108108
"@wordpress/element": "6.0.1",
109109
"@wordpress/escape-html": "3.0.1",
110-
"@wordpress/format-library": "5.0.4",
110+
"@wordpress/format-library": "5.0.5",
111111
"@wordpress/hooks": "4.0.1",
112112
"@wordpress/html-entities": "4.0.1",
113113
"@wordpress/i18n": "5.0.1",
@@ -122,15 +122,15 @@
122122
"@wordpress/media-utils": "5.0.1",
123123
"@wordpress/notices": "5.0.2",
124124
"@wordpress/nux": "9.0.3",
125-
"@wordpress/patterns": "2.0.4",
125+
"@wordpress/patterns": "2.0.5",
126126
"@wordpress/plugins": "7.0.3",
127127
"@wordpress/preferences": "4.0.3",
128128
"@wordpress/preferences-persistence": "2.0.1",
129129
"@wordpress/primitives": "4.0.1",
130130
"@wordpress/priority-queue": "3.0.1",
131131
"@wordpress/private-apis": "1.0.2",
132132
"@wordpress/redux-routine": "5.0.1",
133-
"@wordpress/reusable-blocks": "5.0.4",
133+
"@wordpress/reusable-blocks": "5.0.5",
134134
"@wordpress/rich-text": "7.0.2",
135135
"@wordpress/router": "1.0.2",
136136
"@wordpress/server-side-render": "5.0.3",
@@ -142,7 +142,7 @@
142142
"@wordpress/url": "4.0.1",
143143
"@wordpress/viewport": "6.0.2",
144144
"@wordpress/warning": "3.0.1",
145-
"@wordpress/widgets": "4.0.4",
145+
"@wordpress/widgets": "4.0.5",
146146
"@wordpress/wordcount": "4.0.1",
147147
"backbone": "1.5.0",
148148
"clipboard": "2.0.11",

src/wp-admin/edit-form-blocks.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ static function ( $classes ) {
7272
sprintf( '%s/autosaves?context=edit', $rest_path ),
7373
'/wp/v2/settings',
7474
array( '/wp/v2/settings', 'OPTIONS' ),
75+
'/wp/v2/global-styles/themes/' . get_stylesheet(),
76+
'/wp/v2/themes?context=edit&status=active',
77+
'/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id() . '?context=edit',
7578
);
7679

7780
block_editor_rest_api_preload( $preload_paths, $block_editor_context );

src/wp-admin/includes/class-wp-debug-data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ public static function debug_data() {
12991299
}
13001300

13011301
/** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
1302-
$parent_theme_auto_update_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $parent_theme, $enabled );
1302+
$parent_theme_auto_update_string = apply_filters( 'theme_auto_update_debug_string', $parent_theme_auto_update_string, $parent_theme, $enabled );
13031303

13041304
$info['wp-parent-theme']['fields']['auto_update'] = array(
13051305
'label' => __( 'Auto-update' ),

src/wp-admin/includes/file.php

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,30 +1402,6 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f
14021402
);
14031403
}
14041404

1405-
// Check for an edge-case affecting PHP Maths abilities.
1406-
if (
1407-
! extension_loaded( 'sodium' ) &&
1408-
in_array( PHP_VERSION_ID, array( 70200, 70201, 70202 ), true ) &&
1409-
extension_loaded( 'opcache' )
1410-
) {
1411-
/*
1412-
* Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.
1413-
* https://bugs.php.net/bug.php?id=75938
1414-
*/
1415-
return new WP_Error(
1416-
'signature_verification_unsupported',
1417-
sprintf(
1418-
/* translators: %s: The filename of the package. */
1419-
__( 'The authenticity of %s could not be verified as signature verification is unavailable on this system.' ),
1420-
'<span class="code">' . esc_html( $filename_for_errors ) . '</span>'
1421-
),
1422-
array(
1423-
'php' => PHP_VERSION,
1424-
'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ),
1425-
)
1426-
);
1427-
}
1428-
14291405
// Verify runtime speed of Sodium_Compat is acceptable.
14301406
if ( ! extension_loaded( 'sodium' ) && ! ParagonIE_Sodium_Compat::polyfill_is_fast() ) {
14311407
$sodium_compat_is_fast = false;

src/wp-admin/includes/meta-boxes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ function xfn_check( $xfn_relationship, $xfn_value = '', $deprecated = '' ) {
12701270
_deprecated_argument( __FUNCTION__, '2.5.0' ); // Never implemented.
12711271
}
12721272

1273-
$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
1273+
$link_rel = isset( $link->link_rel ) ? $link->link_rel : '';
12741274
$link_rels = preg_split( '/\s+/', $link_rel );
12751275

12761276
// Mark the specified value as checked if it matches the current link's relationship.

src/wp-content/themes/twentyeleven/editor-blocks.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,12 +409,6 @@ p.has-drop-cap:not(:focus)::first-letter {
409409
text-align: right;
410410
}
411411

412-
/* Verse */
413-
414-
.editor-styles-wrapper .wp-block-verse {
415-
font-family: inherit;
416-
}
417-
418412

419413
/*--------------------------------------------------------------
420414
5.0 Blocks - Layout Elements

src/wp-content/themes/twentyeleven/functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ function twentyeleven_setup() {
304304
*/
305305
function twentyeleven_scripts_styles() {
306306
// Theme block stylesheet.
307-
wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), '20230122' );
307+
wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), '20240621' );
308308
}
309309
add_action( 'wp_enqueue_scripts', 'twentyeleven_scripts_styles' );
310310

@@ -315,7 +315,7 @@ function twentyeleven_scripts_styles() {
315315
*/
316316
function twentyeleven_block_editor_styles() {
317317
// Block styles.
318-
wp_enqueue_style( 'twentyeleven-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), '20220927' );
318+
wp_enqueue_style( 'twentyeleven-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), '20240621' );
319319
}
320320
add_action( 'enqueue_block_editor_assets', 'twentyeleven_block_editor_styles' );
321321

src/wp-content/themes/twentyeleven/header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
?>
5050
</title>
5151
<link rel="profile" href="https://gmpg.org/xfn/11" />
52-
<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20240402" />
52+
<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20240716" />
5353
<link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
5454
<!--[if lt IE 9]>
5555
<script src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/html5.js?ver=3.7.0" type="text/javascript"></script>

src/wp-content/themes/twentyeleven/inc/theme-options.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ function twentyeleven_enqueue_color_scheme() {
418418
$color_scheme = $options['color_scheme'];
419419

420420
if ( 'dark' === $color_scheme ) {
421-
wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), '20190404' );
421+
wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), '20240603' );
422422
}
423423

424424
/**

0 commit comments

Comments
 (0)