Merge remote-tracking branch 'upstream/trunk' into try/remove-gutenberg-git-checkout-and-build

desrosj · desrosj · commit 5dffecc813c1 · 2026-03-09T15:14:20.000-04:00
diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php
@@ -48,7 +48,8 @@
 		);
 	}
 } else {
-	$comment = null;
+	$comment_id = 0;
+	$comment    = null;
 }
 
 switch ( $action ) {
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
@@ -1086,7 +1086,7 @@ th.action-links {
 
 .filter-links .current {
 	box-shadow: none;
-	border-bottom: 4px solid #646970;
+	border-bottom: 4px solid var(--wp-admin-theme-color);
 	color: #1d2327;
 }
 
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
@@ -83,10 +83,6 @@ body:not(.ready) #customize-save-button-wrapper .save {
 	margin-top: 0;
 }
 
-#customize-save-button-wrapper .save:focus, #publish-settings:focus {
-	box-shadow: 0 1px 0 #2271b1, 0 0 2px 1px #72aee6; /* This is default box shadow for focus */
-}
-
 #customize-save-button-wrapper .save.has-next-sibling {
 	border-radius: 3px 0 0 3px;
 }
@@ -499,12 +495,6 @@ body.trashing #publish-settings {
 	left: 6px;
 }
 
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-	color: #2271b1;
-}
-
 #customize-controls .customize-info .customize-panel-description,
 #customize-controls .customize-info .customize-section-description,
 #customize-outer-theme-controls .customize-info .customize-section-description,
@@ -609,15 +599,6 @@ body.trashing #publish-settings {
 	background: transparent;
 }
 
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title button:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title button:focus {
-	color: var(--wp-admin-theme-color, #3858e9);
-	background: #f6f7f7;
-	border-left-color: var(--wp-admin-theme-color, #3858e9);
-}
-
 #accordion-section-themes + .control-section {
 	border-top: 1px solid #dcdcde;
 }
@@ -629,17 +610,6 @@ body.trashing #publish-settings {
 	background: #f6f7f7;
 }
 
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-	color: #2271b1;
-}
-
 #customize-theme-controls .control-section.open {
 	border-bottom: 1px solid #f0f0f1;
 }
@@ -907,8 +877,6 @@ h3.customize-section-title {
 .customize-controls-preview-toggle:focus,
 .customize-controls-preview-toggle:hover {
 	background: #fff;
-	color: #2271b1;
-	border-top-color: #2271b1;
 	box-shadow: none;
 	/* Only visible in Windows High Contrast mode */
 	outline: 1px solid transparent;
@@ -924,9 +892,7 @@ h3.customize-section-title {
 .customize-panel-back:focus,
 .customize-section-back:hover,
 .customize-section-back:focus {
-	color: #2271b1;
 	background: #f6f7f7;
-	border-left-color: #2271b1;
 	box-shadow: none;
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
@@ -2033,8 +1999,6 @@ p.customize-section-description {
 
 .control-panel-themes .customize-themes-section-title:focus,
 .control-panel-themes .customize-themes-section-title:hover {
-	border-left-color: #2271b1;
-	color: #2271b1;
 	background: #f6f7f7;
 }
 
@@ -2063,14 +2027,9 @@ p.customize-section-description {
 	position: absolute;
 	top: 9px;
 	right: 15px;
-	background: #2271b1;
 	color: #fff;
 }
 
-.control-panel-themes .customize-themes-section-title.selected {
-	color: #2271b1;
-}
-
 #customize-theme-controls .themes.accordion-section-content {
 	position: relative;
 	left: 0;
@@ -2373,9 +2332,7 @@ p.customize-section-description {
 
 	.wp-customizer .showing-themes .control-panel-themes .customize-themes-mobile-back:hover,
 	.wp-customizer .showing-themes .control-panel-themes .customize-themes-mobile-back:focus {
-		color: #2271b1;
 		background: #f6f7f7;
-		border-left-color: #2271b1;
 		box-shadow: none;
 		/* Only visible in Windows High Contrast mode */
 		outline: 2px solid transparent;
@@ -2471,13 +2428,11 @@ p.customize-section-description {
 .wp-customizer .theme-overlay .theme-header .left:focus,
 .wp-customizer .theme-overlay .theme-header .left:hover {
 	background: #fff;
-	border-bottom: 4px solid #2271b1;
-	color: #2271b1;
 }
 
 .wp-customizer .theme-overlay .theme-header .close:focus:before,
 .wp-customizer .theme-overlay .theme-header .close:hover:before {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .wp-customizer .theme-overlay .theme-header button.disabled,
diff --git a/src/wp-admin/css/customize-nav-menus.css b/src/wp-admin/css/customize-nav-menus.css
@@ -268,7 +268,7 @@
 #customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
 #customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
 #customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .customize-screen-options-toggle:focus,
@@ -836,13 +836,13 @@ li.assigned-to-menu-location .add-new-menu-item {
 .menu-item-handle:hover {
 	position: relative;
 	z-index: 10;
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .menu-item-handle:hover .item-type,
 .menu-item-handle:hover .item-edit,
 #available-menu-items .menu-item-handle:hover .item-add {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .menu-item-edit-active .menu-item-handle {
diff --git a/src/wp-admin/css/customize-widgets.css b/src/wp-admin/css/customize-widgets.css
@@ -187,7 +187,7 @@
 
 #customize-theme-controls .widget-area-select .selected {
 	color: #fff;
-	background: #2271b1;
+	background: var(--wp-admin-theme-color);
 }
 
 #customize-theme-controls .widget-area-select .selected:before {
@@ -245,8 +245,8 @@
 #available-widgets .widget-tpl.selected {
 	background: #f6f7f7;
 	border-bottom-color: #c3c4c7;
-	color: #2271b1;
-	border-left: 4px solid #2271b1;
+	color: var(--wp-admin-theme-color);;
+	border-left: 4px solid var(--wp-admin-theme-color);
 }
 
 #customize-controls .widget-title h3 {
diff --git a/src/wp-admin/includes/admin-filters.php b/src/wp-admin/includes/admin-filters.php
@@ -53,7 +53,7 @@
 
 // Prerendering.
 if ( ! is_customize_preview() ) {
-	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
+	add_action( 'admin_print_styles', 'wp_resource_hints', 1 );
 }
 
 add_action( 'admin_print_scripts', 'print_emoji_detection_script' );
@@ -85,7 +85,7 @@
 
 add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
 
-add_action( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
+add_filter( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
 add_action( 'edit_form_after_title', '_disable_content_editor_for_navigation_post_type' );
 add_action( 'edit_form_after_editor', '_enable_content_editor_for_navigation_post_type' );
 
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
@@ -683,7 +683,7 @@
 					break;
 				case 'err_admin_role':
 					$messages[] = wp_get_admin_notice(
-						__( 'The current user&#8217;s role must have user editing capabilities.' ),
+						__( 'You cannot change your own role to one that does not allow managing other users. Your role was not changed.' ),
 						array(
 							'id'                 => 'message',
 							'additional_classes' => array( 'error' ),
diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
@@ -596,10 +596,6 @@ html:lang(he-il) .rtl #wpadminbar * {
 	top: 3px;
 }
 
-#wpadminbar #wp-admin-bar-comments .count-0 {
-	opacity: .5;
-}
-
 /**
  * New Content
  */
diff --git a/src/wp-includes/css/customize-preview.css b/src/wp-includes/css/customize-preview.css
@@ -44,7 +44,7 @@
 	line-height: 1 !important;
 	font-size: 18px;
 	z-index: 5;
-	background: #3858e9;
+	background: var( --wp-admin-theme-color, #3858e9 );
 	border-radius: 50%;
 	border: 2px solid #fff;
 	box-shadow: 0 2px 1px rgba(60, 67, 74, 0.15);
@@ -76,11 +76,11 @@
 }
 
 .customize-partial-edit-shortcut button:hover {
-	background: #2145e6 !important; /* matches primary buttons */
+	background: var( --wp-admin-theme-color-darker-10, #2145e6 ) !important; /* matches primary buttons */
 }
 
 .customize-partial-edit-shortcut button:focus {
-	box-shadow: 0 0 0 1.5px #3858e9;
+	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px ) var(--wp-admin-theme-color, #3858e9);
 }
 
 body.customize-partial-edit-shortcuts-shown .customize-partial-edit-shortcut button {
diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
@@ -1012,6 +1012,11 @@
 	font-weight: 600;
 }
 
+/* Do not show the aria-label overlay on thumbnails in the gallery selection strip. */
+.wp-core-ui .media-selection .attachment::after {
+	content: none;
+}
+
 .wp-core-ui .attachment:focus,
 .wp-core-ui .selected.attachment:focus,
 .wp-core-ui .attachment.details:focus {
diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php
@@ -385,7 +385,7 @@
 
 // Login actions.
 add_action( 'login_head', 'wp_robots', 1 );
-add_filter( 'login_head', 'wp_resource_hints', 8 );
+add_action( 'login_head', 'wp_resource_hints', 8 );
 add_action( 'login_head', 'wp_print_head_scripts', 9 );
 add_action( 'login_head', 'print_admin_styles', 9 );
 add_action( 'login_head', 'wp_site_icon', 99 );
diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
@@ -1566,6 +1566,7 @@ function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters =
  * | U+00F6   | ö     | oe          | Latin small letter o with diaeresis     |
  * | U+00DC   | Ü     | Ue          | Latin capital letter U with diaeresis   |
  * | U+00FC   | ü     | ue          | Latin small letter u with diaeresis     |
+ * | U+1E9E   | ẞ     | SS          | Latin capital letter sharp s            |
  * | U+00DF   | ß     | ss          | Latin small letter sharp s              |
  *
  * Danish (`da_DK`) locale:
@@ -1599,6 +1600,7 @@ function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters =
  * @since 5.7.0 Added locale support for `de_AT`.
  * @since 6.0.0 Added the `$locale` parameter.
  * @since 6.1.0 Added Unicode NFC encoding normalization support.
+ * @since 7.0.0 Added capital Eszett (U+1E9E) support for German locales.
  *
  * @param string $text   Text that might have accent characters.
  * @param string $locale Optional. The locale to use for accent removal. Some character
@@ -1972,6 +1974,7 @@ function remove_accents( $text, $locale = '' ) {
 			$chars['ö'] = 'oe';
 			$chars['Ü'] = 'Ue';
 			$chars['ü'] = 'ue';
+			$chars['ẞ'] = 'SS';
 			$chars['ß'] = 'ss';
 		} elseif ( 'da_DK' === $locale ) {
 			$chars['Æ'] = 'Ae';
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
@@ -2179,12 +2179,21 @@ function path_join( $base, $path ) {
  * @since 4.4.0 Ensures upper-case drive letters on Windows systems.
  * @since 4.5.0 Allows for Windows network shares.
  * @since 4.9.7 Allows for PHP file wrappers.
+ * @since 7.0.0 Uses a static cache to store normalized paths.
  *
  * @param string $path Path to normalize.
  * @return string Normalized path.
  */
-function wp_normalize_path( $path ) {
-	$wrapper = '';
+function wp_normalize_path( $path ): string {
+	$path = (string) $path;
+
+	static $cache = array();
+	if ( isset( $cache[ $path ] ) ) {
+		return $cache[ $path ];
+	}
+
+	$original_path = $path;
+	$wrapper       = '';
 
 	if ( wp_is_stream( $path ) ) {
 		list( $wrapper, $path ) = explode( '://', $path, 2 );
@@ -2196,14 +2205,15 @@ function wp_normalize_path( $path ) {
 	$path = str_replace( '\\', '/', $path );
 
 	// Replace multiple slashes down to a singular, allowing for network shares having two slashes.
-	$path = preg_replace( '|(?<=.)/+|', '/', $path );
+	$path = (string) preg_replace( '|(?<=.)/+|', '/', $path );
 
 	// Windows paths should uppercase the drive letter.
 	if ( ':' === substr( $path, 1, 1 ) ) {
 		$path = ucfirst( $path );
 	}
 
-	return $wrapper . $path;
+	$cache[ $original_path ] = $wrapper . $path;
+	return $cache[ $original_path ];
 }
 
 /**
diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
@@ -2892,7 +2892,7 @@ function register_initial_settings() {
 			'type'              => 'boolean',
 			'description'       => __( 'Enable Real-Time Collaboration' ),
 			'sanitize_callback' => 'rest_sanitize_boolean',
-			'default'           => false,
+			'default'           => true,
 			'show_in_rest'      => true,
 		)
 	);
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
@@ -197,18 +197,22 @@ public function get_item( $request ) {
 	public function get_items( $request ) {
 		$themes = array();
 
-		$active_themes = wp_get_themes();
 		$current_theme = wp_get_theme();
 		$status        = $request['status'];
 
-		foreach ( $active_themes as $theme ) {
-			$theme_status = ( $this->is_same_theme( $theme, $current_theme ) ) ? 'active' : 'inactive';
-			if ( is_array( $status ) && ! in_array( $theme_status, $status, true ) ) {
-				continue;
-			}
-
-			$prepared = $this->prepare_item_for_response( $theme, $request );
+		if ( array( 'active' ) === $status ) {
+			$prepared = $this->prepare_item_for_response( $current_theme, $request );
 			$themes[] = $this->prepare_response_for_collection( $prepared );
+		} else {
+			foreach ( wp_get_themes() as $theme ) {
+				$theme_status = ( $this->is_same_theme( $theme, $current_theme ) ) ? 'active' : 'inactive';
+				if ( is_array( $status ) && ! in_array( $theme_status, $status, true ) ) {
+					continue;
+				}
+
+				$prepared = $this->prepare_item_for_response( $theme, $request );
+				$themes[] = $this->prepare_response_for_collection( $prepared );
+			}
 		}
 
 		$response = rest_ensure_response( $themes );
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
@@ -23,7 +23,7 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 61696;
+$wp_db_version = 61833;
 
 /**
  * Holds the TinyMCE version.
diff --git a/tests/phpunit/tests/formatting/removeAccents.php b/tests/phpunit/tests/formatting/removeAccents.php
diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php
diff --git a/tests/phpunit/tests/rest-api/rest-sync-server.php b/tests/phpunit/tests/rest-api/rest-sync-server.php
diff --git a/tests/phpunit/tests/rest-api/rest-themes-controller.php b/tests/phpunit/tests/rest-api/rest-themes-controller.php
diff --git a/tools/gutenberg/copy.js b/tools/gutenberg/copy.js

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@`
`48`	`48`	`);`
`49`	`49`	`}`
`50`	`50`	`} else {`
`51`		`- $comment = null;`
	`51`	`+ $comment_id = 0;`
	`52`	`+ $comment = null;`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`switch ( $action ) {`
Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,7 @@ th.action-links {`
`1086`	`1086`
`1087`	`1087`	`.filter-links .current {`
`1088`	`1088`	`box-shadow: none;`
`1089`		`- border-bottom: 4px solid #646970;`
	`1089`	`+ border-bottom: 4px solid var(--wp-admin-theme-color);`
`1090`	`1090`	`color: #1d2327;`
`1091`	`1091`	`}`
`1092`	`1092`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`line-height: 1 !important;`
`45`	`45`	`font-size: 18px;`
`46`	`46`	`z-index: 5;`
`47`		`- background: #3858e9;`
	`47`	`+ background: var( --wp-admin-theme-color, #3858e9 );`
`48`	`48`	`border-radius: 50%;`
`49`	`49`	`border: 2px solid #fff;`
`50`	`50`	`box-shadow: 0 2px 1px rgba(60, 67, 74, 0.15);`
`@@ -76,11 +76,11 @@`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`.customize-partial-edit-shortcut button:hover {`
`79`		`- background: #2145e6 !important; /* matches primary buttons */`
	`79`	`+ background: var( --wp-admin-theme-color-darker-10, #2145e6 ) !important; /* matches primary buttons */`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`.customize-partial-edit-shortcut button:focus {`
`83`		`- box-shadow: 0 0 0 1.5px #3858e9;`
	`83`	`+ box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px ) var(--wp-admin-theme-color, #3858e9);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`body.customize-partial-edit-shortcuts-shown .customize-partial-edit-shortcut button {`