Merge branch 'trunk' into styles/use-html-api-for-style-tags

Author: sirreal

src/wp-activate.php

@@ -100,7 +100,7 @@ function do_activate_header() {
  */
 function wpmu_activate_stylesheet() {
 	?>
-	<style type="text/css">
+	<style>
 		.wp-activate-container { width: 90%; margin: 0 auto; }
 		.wp-activate-container form { margin-top: 2em; }
 		#submit, #key { width: 100%; font-size: 24px; box-sizing: border-box; }

src/wp-admin/includes/ajax-actions.php

@@ -3946,7 +3946,7 @@ function wp_ajax_parse_media_shortcode() {
 	$styles = wpview_media_sandbox_styles();
 
 	foreach ( $styles as $style ) {
-		$head .= '<link type="text/css" rel="stylesheet" href="' . $style . '">';
+		$head .= '<link rel="stylesheet" href="' . $style . '">';
 	}
 
 	if ( ! empty( $wp_scripts ) ) {

src/wp-admin/includes/class-wp-upgrader.php

@@ -292,30 +292,32 @@ public function fs_connect( $directories = array(), $allow_relaxed_file_ownershi
 	}
 
 	/**
-	 * Downloads a package.
+	 * Downloads a package for a WordPress core, plugin, theme, or translation upgrade.
 	 *
 	 * @since 2.8.0
 	 * @since 5.2.0 Added the `$check_signatures` parameter.
 	 * @since 5.5.0 Added the `$hook_extra` parameter.
 	 *
-	 * @param string $package          The URI of the package. If this is the full path to an
-	 *                                 existing local file, it will be returned untouched.
+	 * @param string $package          The URI of the package. May be a remote URL or local file path. If this is the full
+	 *                                 path to an existing local file, it will be returned untouched.
 	 * @param bool   $check_signatures Whether to validate file signatures. Default false.
 	 * @param array  $hook_extra       Extra arguments to pass to the filter hooks. Default empty array.
 	 * @return string|WP_Error The full path to the downloaded package file, or a WP_Error object.
 	 */
 	public function download_package( $package, $check_signatures = false, $hook_extra = array() ) {
 		/**
-		 * Filters whether to return the package.
+		 * Filters whether to download a package for a WordPress core, plugin, theme, or translation upgrade.
+		 *
+		 * Return a non-false value to short-circuit the download and return that value instead.
 		 *
 		 * @since 3.7.0
 		 * @since 5.5.0 Added the `$hook_extra` parameter.
 		 *
-		 * @param bool        $reply      Whether to bail without returning the package.
-		 *                                Default false.
-		 * @param string      $package    The package file name.
-		 * @param WP_Upgrader $upgrader   The WP_Upgrader instance.
-		 * @param array       $hook_extra Extra arguments passed to hooked filters.
+		 * @param false|string|WP_Error $reply      Whether to short-circuit the download, the path to the downloaded package,
+		 *                                          or a WP_Error object. Default false.
+		 * @param string                $package    The package URI. May be a remote URL or local file path.
+		 * @param WP_Upgrader           $upgrader   The WP_Upgrader instance.
+		 * @param array                 $hook_extra Extra arguments passed to hooked filters.
 		 */
 		$reply = apply_filters( 'upgrader_pre_download', false, $package, $this, $hook_extra );
 		if ( false !== $reply ) {
@@ -519,7 +521,6 @@ public function install_package( $args = array() ) {
 
 		$args = wp_parse_args( $args, $defaults );
 
-		// These were previously extract()'d.
 		$source            = $args['source'];
 		$destination       = $args['destination'];
 		$clear_destination = $args['clear_destination'];
@@ -592,10 +593,10 @@ public function install_package( $args = array() ) {
 		 * @since 2.8.0
 		 * @since 4.4.0 The `$hook_extra` parameter became available.
 		 *
-		 * @param string      $source        File source location.
-		 * @param string      $remote_source Remote file source location.
-		 * @param WP_Upgrader $upgrader      WP_Upgrader instance.
-		 * @param array       $hook_extra    Extra arguments passed to hooked filters.
+		 * @param string|WP_Error $source        File source location or a WP_Error object.
+		 * @param string          $remote_source Remote file source location.
+		 * @param WP_Upgrader     $upgrader      WP_Upgrader instance.
+		 * @param array           $hook_extra    Extra arguments passed to hooked filters.
 		 */
 		$source = apply_filters( 'upgrader_source_selection', $source, $remote_source, $this, $args['hook_extra'] );
 

src/wp-admin/includes/export.php

@@ -239,10 +239,12 @@ function export_wp( $args = array() ) {
 	 *
 	 * @since 2.1.0
 	 *
-	 * @param string $str String to wrap in XML CDATA tag.
+	 * @param string|null $str String to wrap in XML CDATA tag. May be null.
 	 * @return string
 	 */
 	function wxr_cdata( $str ) {
+		$str = (string) $str;
+
 		if ( ! wp_is_valid_utf8( $str ) ) {
 			$str = utf8_encode( $str );
 		}

src/wp-admin/includes/plugin-install.php

@@ -606,7 +606,7 @@ function install_plugin_information() {
 		$low          = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low'];
 		$high         = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high'];
 		?>
-		<style type="text/css">
+		<style>
 			#plugin-information-title.with-banner {
 				background-image: url( <?php echo esc_url( $low ); ?> );
 			}

src/wp-admin/includes/privacy-tools.php

@@ -451,7 +451,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) {
 	fwrite( $file, "<html>\n" );
 	fwrite( $file, "<head>\n" );
 	fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
-	fwrite( $file, "<style type='text/css'>" );
+	fwrite( $file, '<style>' );
 	fwrite( $file, 'body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }' );
 	fwrite( $file, 'table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }' );
 	fwrite( $file, 'th { padding: 5px; text-align: left; width: 20%; }' );

src/wp-admin/update-core.php

@@ -526,19 +526,19 @@ function list_plugin_updates() {
 		// Get plugin compat for running version of WordPress.
 		if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
 			/* translators: %s: WordPress version. */
-			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $cur_wp_version );
+			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: Yes (according to its author)' ), $cur_wp_version );
 		} else {
 			/* translators: %s: WordPress version. */
-			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $cur_wp_version );
+			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: Not tested' ), $cur_wp_version );
 		}
 		// Get plugin compat for updated version of WordPress.
 		if ( $core_update_version ) {
 			if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
 				/* translators: %s: WordPress version. */
-				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $core_update_version );
+				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: Yes (according to its author)' ), $core_update_version );
 			} else {
 				/* translators: %s: WordPress version. */
-				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $core_update_version );
+				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: Not tested' ), $core_update_version );
 			}
 		}
 
@@ -987,7 +987,7 @@ function do_undismiss_core_update() {
 $title       = __( 'WordPress Updates' );
 $parent_file = 'index.php';
 
-$updates_overview  = '<p>' . __( 'On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations from the WordPress.org repositories.' ) . '</p>';
+$updates_overview  = '<p>' . __( 'On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations.' ) . '</p>';
 $updates_overview .= '<p>' . __( 'If an update is available, you&#8127;ll see a notification appear in the Toolbar and navigation menu.' ) . ' ' . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' ) . '</p>';
 
 get_current_screen()->add_help_tab(

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

@@ -335,7 +335,7 @@ function twentyeleven_header_style() {
 
 		// If we get this far, we have custom styles. Let's do this.
 		?>
-		<style type="text/css" id="twentyeleven-header-css">
+		<style id="twentyeleven-header-css">
 		<?php
 		// Has the text been hidden?
 		if ( 'blank' === $text_color ) :

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

@@ -38,7 +38,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=20251202" />
+<link rel="stylesheet" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20251202" />
 <link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
 <?php
 	/*

src/wp-content/themes/twentyfifteen/inc/custom-header.php

@@ -95,7 +95,7 @@ function twentyfifteen_header_style() {
 
 		// If we get this far, we have custom styles. Let's do this.
 		?>
-		<style type="text/css" id="twentyfifteen-header-css">
+		<style id="twentyfifteen-header-css">
 		<?php
 		// Short header for when there is no Custom Header and Header Text is hidden.
 		if ( empty( $header_image ) && ! display_header_text() ) :