Merge remote-tracking branch 'upstream/trunk' into html-api/add-table…

…-support
WordPress · Jul 16, 2024 · 2ded522 · 2ded522
2 parents 9c59014 + b64a068
commit 2ded522
Show file tree

Hide file tree

Showing 123 changed files with 1,987 additions and 1,357 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,11 +28,11 @@
 		"@playwright/test": "1.45.0",
 		"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
 		"@wordpress/babel-preset-default": "8.0.1",
-		"@wordpress/dependency-extraction-webpack-plugin": "6.0.1",
+		"@wordpress/dependency-extraction-webpack-plugin": "6.0.2",
 		"@wordpress/e2e-test-utils": "11.0.1",
 		"@wordpress/e2e-test-utils-playwright": "1.0.1",
 		"@wordpress/prettier-config": "4.0.1",
-		"@wordpress/scripts": "28.0.1",
+		"@wordpress/scripts": "28.0.2",
 		"autoprefixer": "10.4.19",
 		"chalk": "5.3.0",
 		"check-node-version": "4.2.1",
@@ -83,31 +83,31 @@
 		"@wordpress/api-fetch": "7.0.1",
 		"@wordpress/autop": "4.0.1",
 		"@wordpress/blob": "4.0.1",
-		"@wordpress/block-directory": "5.0.5",
-		"@wordpress/block-editor": "13.0.4",
-		"@wordpress/block-library": "9.0.5",
+		"@wordpress/block-directory": "5.0.7",
+		"@wordpress/block-editor": "13.0.5",
+		"@wordpress/block-library": "9.0.6",
 		"@wordpress/block-serialization-default-parser": "5.0.1",
 		"@wordpress/blocks": "13.0.3",
 		"@wordpress/commands": "1.0.3",
 		"@wordpress/components": "28.0.3",
 		"@wordpress/compose": "7.0.1",
-		"@wordpress/core-commands": "1.0.4",
-		"@wordpress/core-data": "7.0.4",
-		"@wordpress/customize-widgets": "5.0.5",
+		"@wordpress/core-commands": "1.0.5",
+		"@wordpress/core-data": "7.0.5",
+		"@wordpress/customize-widgets": "5.0.6",
 		"@wordpress/data": "10.0.2",
 		"@wordpress/data-controls": "4.0.2",
 		"@wordpress/dataviews": "2.0.4",
 		"@wordpress/date": "5.0.1",
 		"@wordpress/deprecated": "4.0.1",
 		"@wordpress/dom": "4.0.1",
 		"@wordpress/dom-ready": "4.0.1",
-		"@wordpress/edit-post": "8.0.5",
-		"@wordpress/edit-site": "6.0.5",
-		"@wordpress/edit-widgets": "6.0.5",
-		"@wordpress/editor": "14.0.4",
+		"@wordpress/edit-post": "8.0.7",
+		"@wordpress/edit-site": "6.0.7",
+		"@wordpress/edit-widgets": "6.0.6",
+		"@wordpress/editor": "14.0.6",
 		"@wordpress/element": "6.0.1",
 		"@wordpress/escape-html": "3.0.1",
-		"@wordpress/format-library": "5.0.4",
+		"@wordpress/format-library": "5.0.5",
 		"@wordpress/hooks": "4.0.1",
 		"@wordpress/html-entities": "4.0.1",
 		"@wordpress/i18n": "5.0.1",
@@ -122,15 +122,15 @@
 		"@wordpress/media-utils": "5.0.1",
 		"@wordpress/notices": "5.0.2",
 		"@wordpress/nux": "9.0.3",
-		"@wordpress/patterns": "2.0.4",
+		"@wordpress/patterns": "2.0.5",
 		"@wordpress/plugins": "7.0.3",
 		"@wordpress/preferences": "4.0.3",
 		"@wordpress/preferences-persistence": "2.0.1",
 		"@wordpress/primitives": "4.0.1",
 		"@wordpress/priority-queue": "3.0.1",
 		"@wordpress/private-apis": "1.0.2",
 		"@wordpress/redux-routine": "5.0.1",
-		"@wordpress/reusable-blocks": "5.0.4",
+		"@wordpress/reusable-blocks": "5.0.5",
 		"@wordpress/rich-text": "7.0.2",
 		"@wordpress/router": "1.0.2",
 		"@wordpress/server-side-render": "5.0.3",
@@ -142,7 +142,7 @@
 		"@wordpress/url": "4.0.1",
 		"@wordpress/viewport": "6.0.2",
 		"@wordpress/warning": "3.0.1",
-		"@wordpress/widgets": "4.0.4",
+		"@wordpress/widgets": "4.0.5",
 		"@wordpress/wordcount": "4.0.1",
 		"backbone": "1.5.0",
 		"clipboard": "2.0.11",

diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php
@@ -72,6 +72,9 @@ static function ( $classes ) {
 	sprintf( '%s/autosaves?context=edit', $rest_path ),
 	'/wp/v2/settings',
 	array( '/wp/v2/settings', 'OPTIONS' ),
+	'/wp/v2/global-styles/themes/' . get_stylesheet(),
+	'/wp/v2/themes?context=edit&status=active',
+	'/wp/v2/global-styles/' . WP_Theme_JSON_Resolver::get_user_global_styles_post_id() . '?context=edit',
 );
 
 block_editor_rest_api_preload( $preload_paths, $block_editor_context );

diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
@@ -1299,7 +1299,7 @@ public static function debug_data() {
 				}
 
 				/** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
-				$parent_theme_auto_update_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $parent_theme, $enabled );
+				$parent_theme_auto_update_string = apply_filters( 'theme_auto_update_debug_string', $parent_theme_auto_update_string, $parent_theme, $enabled );
 
 				$info['wp-parent-theme']['fields']['auto_update'] = array(
 					'label' => __( 'Auto-update' ),

diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
@@ -1402,30 +1402,6 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f
 		);
 	}
 
-	// Check for an edge-case affecting PHP Maths abilities.
-	if (
-		! extension_loaded( 'sodium' ) &&
-		in_array( PHP_VERSION_ID, array( 70200, 70201, 70202 ), true ) &&
-		extension_loaded( 'opcache' )
-	) {
-		/*
-		 * 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.
-		 * https://bugs.php.net/bug.php?id=75938
-		 */
-		return new WP_Error(
-			'signature_verification_unsupported',
-			sprintf(
-				/* translators: %s: The filename of the package. */
-				__( 'The authenticity of %s could not be verified as signature verification is unavailable on this system.' ),
-				'<span class="code">' . esc_html( $filename_for_errors ) . '</span>'
-			),
-			array(
-				'php'    => PHP_VERSION,
-				'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ),
-			)
-		);
-	}
-
 	// Verify runtime speed of Sodium_Compat is acceptable.
 	if ( ! extension_loaded( 'sodium' ) && ! ParagonIE_Sodium_Compat::polyfill_is_fast() ) {
 		$sodium_compat_is_fast = false;

diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
@@ -1270,7 +1270,7 @@ function xfn_check( $xfn_relationship, $xfn_value = '', $deprecated = '' ) {
 		_deprecated_argument( __FUNCTION__, '2.5.0' ); // Never implemented.
 	}
 
-	$link_rel  = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
+	$link_rel  = isset( $link->link_rel ) ? $link->link_rel : '';
 	$link_rels = preg_split( '/\s+/', $link_rel );
 
 	// Mark the specified value as checked if it matches the current link's relationship.

diff --git a/src/wp-content/themes/twentyeleven/editor-blocks.css b/src/wp-content/themes/twentyeleven/editor-blocks.css
@@ -409,12 +409,6 @@ p.has-drop-cap:not(:focus)::first-letter {
 	text-align: right;
 }
 
-/* Verse */
-
-.editor-styles-wrapper .wp-block-verse {
-	font-family: inherit;
-}
-
 
 /*--------------------------------------------------------------
 5.0 Blocks - Layout Elements

diff --git a/src/wp-content/themes/twentyeleven/functions.php b/src/wp-content/themes/twentyeleven/functions.php
@@ -304,7 +304,7 @@ function twentyeleven_setup() {
  */
 function twentyeleven_scripts_styles() {
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), '20230122' );
+	wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), '20240621' );
 }
 add_action( 'wp_enqueue_scripts', 'twentyeleven_scripts_styles' );
 
@@ -315,7 +315,7 @@ function twentyeleven_scripts_styles() {
  */
 function twentyeleven_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentyeleven-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), '20220927' );
+	wp_enqueue_style( 'twentyeleven-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), '20240621' );
 }
 add_action( 'enqueue_block_editor_assets', 'twentyeleven_block_editor_styles' );
 

diff --git a/src/wp-content/themes/twentyeleven/header.php b/src/wp-content/themes/twentyeleven/header.php
@@ -49,7 +49,7 @@
 ?>
 	</title>
 <link rel="profile" href="https://gmpg.org/xfn/11" />
-<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20240402" />
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20240716" />
 <link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
 <!--[if lt IE 9]>
 <script src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/html5.js?ver=3.7.0" type="text/javascript"></script>

diff --git a/src/wp-content/themes/twentyeleven/inc/theme-options.php b/src/wp-content/themes/twentyeleven/inc/theme-options.php
@@ -418,7 +418,7 @@ function twentyeleven_enqueue_color_scheme() {
 	$color_scheme = $options['color_scheme'];
 
 	if ( 'dark' === $color_scheme ) {
-		wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), '20190404' );
+		wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), '20240603' );
 	}
 
 	/**

diff --git a/src/wp-content/themes/twentyeleven/readme.txt b/src/wp-content/themes/twentyeleven/readme.txt
@@ -1,9 +1,9 @@
 === Twenty Eleven ===
 Contributors: wordpressdotorg
 Requires at least: 3.2
-Tested up to: 6.5
+Tested up to: 6.6
 Requires PHP: 5.2.4
-Stable tag: 4.6
+Stable tag: 4.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, block-patterns
@@ -48,6 +48,11 @@ Images
 
 == Changelog ==
 
+= 4.7 =
+* Released: July 16, 2024
+
+https://wordpress.org/documentation/article/twenty-eleven-changelog/#Version_4.7
+
 = 4.6 =
 * Released: April 2, 2024
 

diff --git a/src/wp-content/themes/twentyeleven/style.css b/src/wp-content/themes/twentyeleven/style.css
@@ -4,9 +4,9 @@ Theme URI: https://wordpress.org/themes/twentyeleven/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2011 theme for WordPress is sophisticated, lightweight, and adaptable. Make it yours with a custom menu, header image, and background -- then go further with available theme options for light or dark color scheme, custom link colors, and three layout choices. Twenty Eleven comes equipped with a Showcase page template that transforms your front page into a showcase to show off your best content, widget support galore (sidebar, three footer areas, and a Showcase page widget area), and a custom "Ephemera" widget to display your Aside, Link, Quote, or Status posts. Included are styles for print and for the admin editor, support for featured images (as custom header images on posts and pages and as large images on featured "sticky" posts), and special styles for six different post formats.
-Version: 4.6
+Version: 4.7
 Requires at least: 3.2
-Tested up to: 6.5
+Tested up to: 6.6
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

diff --git a/src/wp-content/themes/twentyfifteen/css/blocks.css b/src/wp-content/themes/twentyfifteen/css/blocks.css
@@ -320,31 +320,27 @@ p.has-drop-cap:not(:focus)::first-letter {
 /* Pullquote */
 
 .wp-block-pullquote {
-	border: 0;
+	border: 0 solid;
 }
 
 .wp-block-pullquote blockquote {
 	border: 0;
+	color: inherit;
 	margin-left: 0;
 	margin-right: 0;
 	padding-left: 0;
 	padding-right: 0;
 }
 
 .wp-block-pullquote cite {
-	color: #333;
+	color: inherit;
 	font-family: "Noto Sans", sans-serif;
 	font-size: 15px;
 	font-style: normal;
 	line-height: 1.6;
 	text-transform: none;
 }
 
-.wp-block-pullquote[class*="-text-color"] blockquote cite,
-.wp-block-pullquote[style*="color"] blockquote cite {
-	color: inherit;
-}
-
 @media screen and (min-width: 46.25em) {
 	.wp-block-pullquote cite {
 		font-size: 17px;

diff --git a/src/wp-content/themes/twentyfifteen/css/editor-blocks.css b/src/wp-content/themes/twentyfifteen/css/editor-blocks.css
@@ -672,29 +672,29 @@ p.has-drop-cap:not(:focus)::first-letter {
 	padding: 0;
 }
 
+.wp-block-code {
+	font-family: Inconsolata, monospace;
+}
+
 /* Pullquote */
 
 .wp-block-pullquote,
-.editor-block-list__block .wp-block-pullquote blockquote {
-	border: 0;
+.editor-styles-wrapper .wp-block-pullquote blockquote {
+	border: 0 solid;
+	color: inherit;
 	margin: 0;
 	padding-left: 0;
 }
 
 .wp-block-pullquote .wp-block-pullquote__citation {
-	color: #333;
+	color: inherit;
 	font-family: "Noto Sans", sans-serif;
 	font-size: 15px;
 	font-style: normal;
 	line-height: 1.6;
 	text-transform: none;
 }
 
-.wp-block-pullquote[class*="-text-color"] blockquote cite,
-.wp-block-pullquote[style*="color"] blockquote cite {
-	color: inherit;
-}
-
 @media screen and (min-width: 46.25em) {
 	.wp-block-pullquote .wp-block-pullquote__citation {
 		font-size: 17px;
@@ -741,12 +741,6 @@ p.has-drop-cap:not(:focus)::first-letter {
 	text-align: right;
 }
 
-/* Verse */
-
-.editor-styles-wrapper .wp-block-verse {
-	font-family: inherit;
-}
-
 /*--------------------------------------------------------------
 5.0 Blocks - Layout Elements
 --------------------------------------------------------------*/

diff --git a/src/wp-content/themes/twentyfifteen/functions.php b/src/wp-content/themes/twentyfifteen/functions.php
@@ -430,10 +430,10 @@ function twentyfifteen_scripts() {
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '20201026' );
 
 	// Load our main stylesheet.
-	wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri(), array(), '20240402' );
+	wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri(), array(), '20240716' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentyfifteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfifteen-style' ), '20240210' );
+	wp_enqueue_style( 'twentyfifteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfifteen-style' ), '20240609' );
 
 	// Register the Internet Explorer specific stylesheet.
 	wp_register_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20220908' );
@@ -484,7 +484,7 @@ function twentyfifteen_scripts() {
  */
 function twentyfifteen_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentyfifteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20240117' );
+	wp_enqueue_style( 'twentyfifteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20240609' );
 	// Add custom fonts.
 	$font_version = ( 0 === strpos( (string) twentyfifteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
 	wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), $font_version );

diff --git a/src/wp-content/themes/twentyfifteen/readme.txt b/src/wp-content/themes/twentyfifteen/readme.txt
@@ -1,9 +1,9 @@
 === Twenty Fifteen ===
 Contributors: wordpressdotorg
 Requires at least: 4.1
-Tested up to: 6.5
+Tested up to: 6.6
 Requires PHP: 5.2.4
-Version: 3.7
+Version: 3.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, two-columns, left-sidebar, accessibility-ready, custom-background, custom-colors, custom-header, custom-logo, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
@@ -77,6 +77,11 @@ Source: https://stocksnap.io/photo/purple-yellow-ACF0693B9C
 
 == Changelog ==
 
+= 3.8 =
+* Released: July 16, 2024
+
+https://wordpress.org/documentation/article/twenty-fifteen-changelog/#Version_3.8
+
 = 3.7 =
 * Released: April 2, 2024
 

diff --git a/src/wp-content/themes/twentyfifteen/style.css b/src/wp-content/themes/twentyfifteen/style.css
@@ -4,9 +4,9 @@ Theme URI: https://wordpress.org/themes/twentyfifteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty Fifteen's simple, straightforward typography is readable on a wide variety of screen sizes, and suitable for multiple languages. We designed it using a mobile-first approach, meaning your content takes center-stage, regardless of whether your visitors arrive by smartphone, tablet, laptop, or desktop computer.
-Version: 3.7
+Version: 3.8
 Requires at least: 4.1
-Tested up to: 6.5
+Tested up to: 6.6
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

diff --git a/src/wp-content/themes/twentyfourteen/css/blocks.css b/src/wp-content/themes/twentyfourteen/css/blocks.css
@@ -237,17 +237,12 @@ p.has-drop-cap:not(:focus)::first-letter {
 	overflow-x: visible;
 }
 
-.wp-block-table:not(.is-style-stripes) th,
-.wp-block-table:not(.is-style-stripes) td {
+.wp-block-table:where(:not(.is-style-stripes)) th,
+.wp-block-table:where(:not(.is-style-stripes)) td {
 	border-color: rgba(0, 0, 0, 0.1);
 	border-width: 0 1px 1px 0;
 }
 
-.wp-block-table:not(.is-style-stripes) table[class*="-text-color"] * {
-	border-color: inherit;
-	border: 1px solid;
-}
-
 /*--------------------------------------------------------------
 4.0 Blocks - Layout Elements
 --------------------------------------------------------------*/