Tag 6.0.2

Built from https://develop.svn.wordpress.org/tags/6.0.2@54011


git-svn-id: http://core.svn.wordpress.org/tags/6.0.2@53570 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/about.php

@@ -40,91 +40,6 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 		<div class="about__section changelog">
 			<div class="column">
 				<h2><?php _e( 'Maintenance and Security Releases' ); ?></h2>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number. */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'6.0.6'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL. */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version. */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '6.0.6' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: WordPress version number, 2: Plural number of bugs. More than one security issue. */
-						_n(
-							'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-							'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.',
-							1
-						),
-						'6.0.5',
-						'1'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL. */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version. */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '6.0.5' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number. */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'6.0.4'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL. */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version. */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '6.0.4' )
-						)
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: WordPress version number. */
-						__( '<strong>Version %s</strong> addressed some security issues.' ),
-						'6.0.3'
-					);
-					?>
-					<?php
-					printf(
-						/* translators: %s: HelpHub URL. */
-						__( 'For more information, see <a href="%s">the release notes</a>.' ),
-						sprintf(
-							/* translators: %s: WordPress version. */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							sanitize_title( '6.0.3' )
-						)
-					);
-					?>
-				</p>
 				<p>
 					<?php
 					printf(
@@ -516,15 +431,3 @@ _n_noop(
 
 /* translators: %s: Documentation URL. */
 __( 'For more information, see <a href="%s">the release notes</a>.' );
-
-/* translators: 1: WordPress version number, 2: Link to update WordPress */
-__( 'Important! Your version of WordPress (%1$s) is no longer supported, you will not receive any security updates for your website. To keep your site secure, please <a href="%2$s">update to the latest version of WordPress</a>.' );
-
-/* translators: 1: WordPress version number, 2: Link to update WordPress */
-__( 'Important! Your version of WordPress (%1$s) will stop receiving security updates in the near future. To keep your site secure, please <a href="%2$s">update to the latest version of WordPress</a>.' );
-
-/* translators: %s: The major version of WordPress for this branch. */
-__( 'This is the final release of WordPress %s' );
-
-/* translators: The localized WordPress download URL. */
-__( 'https://wordpress.org/download/' );

wp-admin/includes/ajax-actions.php

@@ -2742,10 +2742,6 @@ function wp_ajax_set_attachment_thumbnail() {
 		wp_send_json_error();
 	}
 
-	if ( false === check_ajax_referer( 'set-attachment-thumbnail', '_ajax_nonce', false ) ) {
-		wp_send_json_error();
-	}
-
 	$post_ids = array();
 	// For each URL, try to find its corresponding post ID.
 	foreach ( $_POST['urls'] as $url ) {
@@ -2998,7 +2994,7 @@ function wp_ajax_query_attachments() {
 
 	// Filter query clauses to include filenames.
 	if ( isset( $query['s'] ) ) {
-		add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
+		add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
 	}
 
 	/**
@@ -3822,29 +3818,13 @@ function wp_ajax_parse_media_shortcode() {
 
 	$shortcode = wp_unslash( $_POST['shortcode'] );
 
-	// Only process previews for media related shortcodes:
-	$found_shortcodes = get_shortcode_tags_in_content( $shortcode );
-	$media_shortcodes = array(
-		'audio',
-		'embed',
-		'playlist',
-		'video',
-		'gallery',
-	);
-
-	$other_shortcodes = array_diff( $found_shortcodes, $media_shortcodes );
-
-	if ( ! empty( $other_shortcodes ) ) {
-		wp_send_json_error();
-	}
-
 	if ( ! empty( $_POST['post_ID'] ) ) {
 		$post = get_post( (int) $_POST['post_ID'] );
 	}
 
 	// The embed shortcode requires a post.
 	if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
-		if ( in_array( 'embed', $found_shortcodes, true ) ) {
+		if ( 'embed' === $shortcode ) {
 			wp_send_json_error();
 		}
 	} else {

wp-admin/includes/class-wp-comments-list-table.php

@@ -640,19 +640,6 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 		$this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
 
-		$edit_post_cap = $post ? 'edit_post' : 'edit_posts';
-		if (
-			current_user_can( $edit_post_cap, $comment->comment_post_ID ) ||
-			(
-				empty( $post->post_password ) &&
-				current_user_can( 'read_post', $comment->comment_post_ID )
-			)
-		) {
-			// The user has access to the post
-		} else {
-			return false;
-		}
-
 		echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
 		$this->single_row_columns( $comment );
 		echo "</tr>\n";

wp-admin/includes/class-wp-list-table.php

@@ -739,20 +739,6 @@ class WP_List_Table {
 			$pending_comments_number
 		);
 
-		$post_object   = get_post( $post_id );
-		$edit_post_cap = $post_object ? 'edit_post' : 'edit_posts';
-		if (
-			current_user_can( $edit_post_cap, $post_id ) ||
-			(
-				empty( $post_object->post_password ) &&
-				current_user_can( 'read_post', $post_id )
-			)
-		) {
-			// The user has access to the post and thus can see comments
-		} else {
-			return false;
-		}
-
 		if ( ! $approved_comments && ! $pending_comments ) {
 			// No comments at all.
 			printf(

wp-admin/includes/dashboard.php

@@ -1085,17 +1085,7 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
 		foreach ( $comments as $comment ) {
-
-			$comment_post = get_post( $comment->comment_post_ID );
-			if (
-				current_user_can( 'edit_post', $comment->comment_post_ID ) ||
-				(
-					empty( $comment_post->post_password ) &&
-					current_user_can( 'read_post', $comment->comment_post_ID )
-				)
-			) {
-				_wp_dashboard_recent_comments_row( $comment );
-			}
+			_wp_dashboard_recent_comments_row( $comment );
 		}
 		echo '</ul>';
 

wp-admin/includes/post.php

@@ -1302,7 +1302,7 @@ function wp_edit_attachments_query_vars( $q = false ) {
 
 	// Filter query clauses to include filenames.
 	if ( isset( $q['s'] ) ) {
-		add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
+		add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
 	}
 
 	return $q;

wp-admin/includes/user.php

@@ -606,8 +606,6 @@ Please click the following link to activate your user account:
  * Checks if the Authorize Application Password request is valid.
  *
  * @since 5.6.0
- * @since 6.2.0 Allow insecure HTTP connections for the local environment.
- * @since 6.3.2 Validates the success and reject URLs to prevent javascript pseudo protocol being executed.
  *
  * @param array   $request {
  *     The array of request data. All arguments are optional and may be empty.
@@ -623,22 +621,24 @@ Please click the following link to activate your user account:
 function wp_is_authorize_application_password_request_valid( $request, $user ) {
 	$error = new WP_Error();
 
-	if ( isset( $request['success_url'] ) ) {
-		$validated_success_url = wp_is_authorize_application_redirect_url_valid( $request['success_url'] );
-		if ( is_wp_error( $validated_success_url ) ) {
+	if ( ! empty( $request['success_url'] ) ) {
+		$scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME );
+
+		if ( 'http' === $scheme ) {
 			$error->add(
-				$validated_success_url->get_error_code(),
-				$validated_success_url->get_error_message()
+				'invalid_redirect_scheme',
+				__( 'The success URL must be served over a secure connection.' )
 			);
 		}
 	}
 
-	if ( isset( $request['reject_url'] ) ) {
-		$validated_reject_url = wp_is_authorize_application_redirect_url_valid( $request['reject_url'] );
-		if ( is_wp_error( $validated_reject_url ) ) {
+	if ( ! empty( $request['reject_url'] ) ) {
+		$scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME );
+
+		if ( 'http' === $scheme ) {
 			$error->add(
-				$validated_reject_url->get_error_code(),
-				$validated_reject_url->get_error_message()
+				'invalid_redirect_scheme',
+				__( 'The rejection URL must be served over a secure connection.' )
 			);
 		}
 	}
@@ -667,59 +667,3 @@ function wp_is_authorize_application_password_request_valid( $request, $user ) {
 
 	return true;
 }
-
-/**
- * Validates the redirect URL protocol scheme. The protocol can be anything except http and javascript.
- *
- * @since 6.3.2
- *
- * @param string $url - The redirect URL to be validated.
- *
- * @return true|WP_Error True if the redirect URL is valid, a WP_Error object otherwise.
- */
-function wp_is_authorize_application_redirect_url_valid( $url ) {
-	$bad_protocols = array( 'javascript', 'data' );
-	if ( empty( $url ) ) {
-		return true;
-	}
-
-	// Based on https://www.rfc-editor.org/rfc/rfc2396#section-3.1
-	$valid_scheme_regex = '/^[a-zA-Z][a-zA-Z0-9+.-]*:/';
-	if ( ! preg_match( $valid_scheme_regex, $url ) ) {
-		return new WP_Error(
-			'invalid_redirect_url_format',
-			__( 'Invalid URL format.' )
-		);
-	}
-
-	/**
-	 * Filters the list of invalid protocols used in applications redirect URLs.
-	 *
-	 * @since 6.3.2
-	 *
-	 * @param string[]  $bad_protocols Array of invalid protocols.
-	 * @param string    $url The redirect URL to be validated.
-	 */
-	$invalid_protocols = array_map( 'strtolower', apply_filters( 'wp_authorize_application_redirect_url_invalid_protocols', $bad_protocols, $url ) );
-
-	$scheme   = wp_parse_url( $url, PHP_URL_SCHEME );
-	$host     = wp_parse_url( $url, PHP_URL_HOST );
-	$is_local = 'local' === wp_get_environment_type();
-
-	// validates if the proper URI format is applied to the $url
-	if ( empty( $host ) || empty( $scheme ) || in_array( strtolower( $scheme ), $invalid_protocols, true ) ) {
-		return new WP_Error(
-			'invalid_redirect_url_format',
-			__( 'Invalid URL format.' )
-		);
-	}
-
-	if ( 'http' === $scheme && ! $is_local ) {
-		return new WP_Error(
-			'invalid_redirect_scheme',
-			__( 'The URL must be served over a secure connection.' )
-		);
-	}
-
-	return true;
-}

wp-includes/Requests/Hooks.php

@@ -65,8 +65,4 @@ class Requests_Hooks implements Requests_Hooker {
 
 		return true;
 	}
-
-	public function __wakeup() {
-		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
-	}
 }

wp-includes/Requests/IRI.php

@@ -705,20 +705,6 @@ class Requests_IRI {
 		return true;
 	}
 
-	public function __wakeup() {
-		$class_props = get_class_vars( __CLASS__ );
-		$string_props = array( 'scheme', 'iuserinfo', 'ihost', 'port', 'ipath', 'iquery', 'ifragment' );
-		$array_props = array( 'normalization' );
-		foreach ( $class_props as $prop => $default_value ) {
-			if ( in_array( $prop, $string_props, true ) && ! is_string( $this->$prop ) ) {
-				throw new UnexpectedValueException();
-			} elseif ( in_array( $prop, $array_props, true ) && ! is_array( $this->$prop ) ) {
-				throw new UnexpectedValueException();
-			}
-			$this->$prop = null;
-		}
-	}
-
 	/**
 	 * Set the entire IRI. Returns true on success, false on failure (if there
 	 * are any invalid characters).

wp-includes/Requests/Session.php

@@ -229,10 +229,6 @@ class Requests_Session {
 		return Requests::request_multiple($requests, $options);
 	}
 
-	public function __wakeup() {
-		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
-	}
-
 	/**
 	 * Merge a request's data with the default data
 	 *

wp-includes/block-template.php

@@ -237,12 +237,12 @@ function get_the_block_template_html() {
 
 	$content = $wp_embed->run_shortcode( $_wp_current_template_content );
 	$content = $wp_embed->autoembed( $content );
-	$content = shortcode_unautop( $content );
-	$content = do_shortcode( $content );
 	$content = do_blocks( $content );
 	$content = wptexturize( $content );
 	$content = convert_smilies( $content );
+	$content = shortcode_unautop( $content );
 	$content = wp_filter_content_tags( $content );
+	$content = do_shortcode( $content );
 	$content = str_replace( ']]>', ']]>', $content );
 
 	// Wrap block template in .wp-site-blocks to allow for specific descendant styles

wp-includes/blocks.php

@@ -647,10 +647,6 @@ function serialize_blocks( $blocks ) {
 function filter_block_content( $text, $allowed_html = 'post', $allowed_protocols = array() ) {
 	$result = '';
 
-	if ( false !== strpos( $text, '<!--' ) && false !== strpos( $text, '--->' ) ) {
-		$text = preg_replace_callback( '%<!--(.*?)--->%', '_filter_block_content_callback', $text );
-	}
-
 	$blocks = parse_blocks( $text );
 	foreach ( $blocks as $block ) {
 		$block   = filter_block_kses( $block, $allowed_html, $allowed_protocols );
@@ -660,19 +656,6 @@ function filter_block_content( $text, $allowed_html = 'post', $allowed_protocols
 	return $result;
 }
 
-/**
- * Callback used for regular expression replacement in filter_block_content().
- *
- * @private
- * @since 6.2.1
- *
- * @param array $matches Array of preg_replace_callback matches.
- * @return string Replacement string.
- */
-function _filter_block_content_callback( $matches ) {
-	return '<!--' . rtrim( $matches[1], '-' ) . '-->';
-}
-
 /**
  * Filters and sanitizes a parsed block to remove non-allowable HTML from block
  * attribute values.

wp-includes/blocks/legacy-widget.php

@@ -34,7 +34,7 @@ function render_block_core_legacy_widget( $attributes ) {
 
 	if ( isset( $attributes['instance']['encoded'], $attributes['instance']['hash'] ) ) {
 		$serialized_instance = base64_decode( $attributes['instance']['encoded'] );
-		if ( ! hash_equals( wp_hash( $serialized_instance ), (string) $attributes['instance']['hash'] ) ) {
+		if ( wp_hash( $serialized_instance ) !== $attributes['instance']['hash'] ) {
 			return '';
 		}
 		$instance = unserialize( $serialized_instance );

wp-includes/blocks/navigation.php

@@ -626,7 +626,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		__( 'Close menu' ), // Close button label.
 		esc_attr( implode( ' ', $responsive_container_classes ) ),
 		esc_attr( implode( ' ', $open_button_classes ) ),
-		esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
+		safecss_filter_attr( $colors['overlay_inline_styles'] ),
 		__( 'Menu' ),
 		$toggle_button_content
 	);

wp-includes/blocks/post-featured-image.php

@@ -45,7 +45,7 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
 		if ( ! empty( $attributes['scale'] ) ) {
 			$image_styles .= "object-fit:{$attributes['scale']};";
 		}
-		$featured_image = str_replace( '<img ', '<img style="' . esc_attr( safecss_filter_attr( $image_styles ) ) . '" ', $featured_image );
+		$featured_image = str_replace( 'src=', 'style="' . esc_attr( $image_styles ) . '" src=', $featured_image );
 	}
 
 	return "<figure $wrapper_attributes>$featured_image</figure>";

wp-includes/blocks/rss.php

@@ -20,7 +20,7 @@ function render_block_core_rss( $attributes ) {
 	$rss = fetch_feed( $attributes['feedURL'] );
 
 	if ( is_wp_error( $rss ) ) {
-		return '<div class="components-placeholder"><div class="notice notice-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $rss->get_error_message() ) . '</div></div>';
+		return '<div class="components-placeholder"><div class="notice notice-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</div></div>';
 	}
 
 	if ( ! $rss->get_item_quantity() ) {
@@ -48,8 +48,8 @@ function render_block_core_rss( $attributes ) {
 			if ( $date ) {
 				$date = sprintf(
 					'<time datetime="%1$s" class="wp-block-rss__item-publish-date">%2$s</time> ',
-					esc_attr( date_i18n( get_option( 'c' ), $date ) ),
-					esc_attr( date_i18n( get_option( 'date_format' ), $date ) )
+					date_i18n( get_option( 'c' ), $date ),
+					date_i18n( get_option( 'date_format' ), $date )
 				);
 			}
 		}

wp-includes/blocks/search.php

@@ -287,12 +287,12 @@ function styles_for_block_core_search( $attributes ) {
 	// Add color styles.
 	$has_text_color = ! empty( $attributes['style']['color']['text'] );
 	if ( $has_text_color ) {
-		$button_styles[] = sprintf( 'color: %s;', $attributes['style']['color']['text'] );
+		$button_styles[] = sprintf( 'color: %s;', esc_attr( $attributes['style']['color']['text'] ) );
 	}
 
 	$has_background_color = ! empty( $attributes['style']['color']['background'] );
 	if ( $has_background_color ) {
-		$button_styles[] = sprintf( 'background-color: %s;', $attributes['style']['color']['background'] );
+		$button_styles[] = sprintf( 'background-color: %s;', esc_attr( $attributes['style']['color']['background'] ) );
 	}
 
 	$has_custom_gradient = ! empty( $attributes['style']['color']['gradient'] );
@@ -301,9 +301,9 @@ function styles_for_block_core_search( $attributes ) {
 	}
 
 	return array(
-		'input'   => ! empty( $input_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $input_styles ) ) ) ) : '',
-		'button'  => ! empty( $button_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $button_styles ) ) ) ) : '',
-		'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) ) : '',
+		'input'   => ! empty( $input_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $input_styles ) ) ) : '',
+		'button'  => ! empty( $button_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $button_styles ) ) ) : '',
+		'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) : '',
 	);
 }
 

wp-includes/blocks/template-part.php

@@ -128,14 +128,14 @@ function render_block_core_template_part( $attributes ) {
 	}
 
 	// Run through the actions that are typically taken on the_content.
-	$content                       = shortcode_unautop( $content );
-	$content                       = do_shortcode( $content );
 	$seen_ids[ $template_part_id ] = true;
 	$content                       = do_blocks( $content );
 	unset( $seen_ids[ $template_part_id ] );
 	$content = wptexturize( $content );
 	$content = convert_smilies( $content );
+	$content = shortcode_unautop( $content );
 	$content = wp_filter_content_tags( $content );
+	$content = do_shortcode( $content );
 
 	// Handle embeds for block template parts.
 	global $wp_embed;

wp-includes/blocks/widget-group.php

@@ -28,7 +28,7 @@ function render_block_core_widget_group( $attributes, $content, $block ) {
 	$html = '';
 
 	if ( ! empty( $attributes['title'] ) ) {
-		$html .= $before_title . esc_html( $attributes['title'] ) . $after_title;
+		$html .= $before_title . $attributes['title'] . $after_title;
 	}
 
 	$html .= '<div class="wp-widget-group__inner-blocks">';

wp-includes/class-wp-block-patterns-registry.php

@@ -186,21 +186,6 @@ final class WP_Block_Patterns_Registry {
 		return isset( $this->registered_patterns[ $pattern_name ] );
 	}
 
-	public function __wakeup() {
-		if ( ! $this->registered_patterns ) {
-			return;
-		}
-		if ( ! is_array( $this->registered_patterns ) ) {
-			throw new UnexpectedValueException();
-		}
-		foreach ( $this->registered_patterns as $value ) {
-			if ( ! is_array( $value ) ) {
-				throw new UnexpectedValueException();
-			}
-		}
-		$this->registered_patterns_outside_init = array();
-	}
-
 	/**
 	 * Utility method to retrieve the main instance of the class.
 	 *

wp-includes/class-wp-block-type-registry.php

@@ -167,20 +167,6 @@ final class WP_Block_Type_Registry {
 		return isset( $this->registered_block_types[ $name ] );
 	}
 
-	public function __wakeup() {
-		if ( ! $this->registered_block_types ) {
-			return;
-		}
-		if ( ! is_array( $this->registered_block_types ) ) {
-			throw new UnexpectedValueException();
-		}
-		foreach ( $this->registered_block_types as $value ) {
-			if ( ! $value instanceof WP_Block_Type ) {
-				throw new UnexpectedValueException();
-			}
-		}
-	}
-
 	/**
 	 * Utility method to retrieve the main instance of the class.
 	 *

wp-includes/class-wp-date-query.php

@@ -149,8 +149,8 @@ class WP_Date_Query {
 			return;
 		}
 
-		if ( isset( $date_query['relation'] ) ) {
-			$this->relation = $this->sanitize_relation( $date_query['relation'] );
+		if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
+			$this->relation = 'OR';
 		} else {
 			$this->relation = 'AND';
 		}
@@ -219,9 +219,6 @@ class WP_Date_Query {
 			$this->validate_date_values( $queries );
 		}
 
-		// Sanitize the relation parameter.
-		$queries['relation'] = $this->sanitize_relation( $queries['relation'] );
-
 		foreach ( $queries as $key => $q ) {
 			if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
 				// This is a first-order query. Trust the values and sanitize when building SQL.
@@ -1043,20 +1040,4 @@ class WP_Date_Query {
 
 		return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
 	}
-
-	/**
-	 * Sanitizes a 'relation' operator.
-	 *
-	 * @since 6.0.3
-	 *
-	 * @param string $relation Raw relation key from the query argument.
-	 * @return string Sanitized relation ('AND' or 'OR').
-	 */
-	public function sanitize_relation( $relation ) {
-		if ( 'OR' === strtoupper( $relation ) ) {
-			return 'OR';
-		} else {
-			return 'AND';
-		}
-	}
 }

wp-includes/class-wp-query.php

@@ -444,14 +444,6 @@ class WP_Query {
 	 */
 	public $thumbnails_cached = false;
 
-	/**
-	 * Controls whether an attachment query should include filenames or not.
-	 *
-	 * @since 6.0.3
-	 * @var bool
-	 */
-	protected $allow_query_attachment_by_filename = false;
-
 	/**
 	 * Cached list of search stopwords.
 	 *
@@ -1422,13 +1414,8 @@ class WP_Query {
 				$q['search_orderby_title'][] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $like );
 			}
 
-			$like = $n . $wpdb->esc_like( $term ) . $n;
-
-			if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
-				$search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s) $andor_op (sq1.meta_value $like_op %s))", $like, $like, $like, $like );
-			} else {
-				$search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
-			}
+			$like      = $n . $wpdb->esc_like( $term ) . $n;
+			$search   .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
 			$searchand = ' AND ';
 		}
 
@@ -1823,16 +1810,6 @@ class WP_Query {
 		// Fill again in case 'pre_get_posts' unset some vars.
 		$q = $this->fill_query_vars( $q );
 
-		/**
-		 * Filters whether an attachment query should include filenames or not.
-		 *
-		 * @since 6.0.3
-		 *
-		 * @param bool $allow_query_attachment_by_filename Whether or not to include filenames.
-		 */
-		$this->allow_query_attachment_by_filename = apply_filters( 'wp_allow_query_attachment_by_filename', false );
-		remove_all_filters( 'wp_allow_query_attachment_by_filename' );
-
 		// Parse meta query.
 		$this->meta_query = new WP_Meta_Query();
 		$this->meta_query->parse_query_vars( $q );
@@ -2264,7 +2241,7 @@ class WP_Query {
 			}
 		}
 
-		if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
+		if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
 			$groupby = "{$wpdb->posts}.ID";
 		}
 
@@ -2341,10 +2318,6 @@ class WP_Query {
 		}
 		$where .= $search . $whichauthor . $whichmimetype;
 
-		if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
-			$join .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
-		}
-
 		if ( ! empty( $this->meta_query->queries ) ) {
 			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 			$join   .= $clauses['join'];

wp-includes/class-wp-theme.php

@@ -713,28 +713,6 @@ final class WP_Theme implements ArrayAccess {
 		return isset( $this->parent ) ? $this->parent : false;
 	}
 
-	/**
-	 * Perform reinitialization tasks.
-	 *
-	 * Prevents a callback from being injected during unserialization of an object.
-	 *
-	 * @return void
-	 */
-	public function __wakeup() {
-		if ( $this->parent && ! $this->parent instanceof self ) {
-			throw new UnexpectedValueException();
-		}
-		if ( $this->headers && ! is_array( $this->headers ) ) {
-			throw new UnexpectedValueException();
-		}
-		foreach ( $this->headers as $value ) {
-			if ( ! is_string( $value ) ) {
-				throw new UnexpectedValueException();
-			}
-		}
-		$this->headers_sanitized = array();
-	}
-
 	/**
 	 * Adds theme data to cache.
 	 *
@@ -1793,16 +1771,4 @@ final class WP_Theme implements ArrayAccess {
 	private static function _name_sort_i18n( $a, $b ) {
 		return strnatcasecmp( $a->name_translated, $b->name_translated );
 	}
-
-	private static function _check_headers_property_has_correct_type( $headers ) {
-		if ( ! is_array( $headers ) ) {
-			return false;
-		}
-		foreach ( $headers as $key => $value ) {
-			if ( ! is_string( $key ) || ! is_string( $value ) ) {
-				return false;
-			}
-		}
-		return true;
-	}
 }

wp-includes/comment.php

@@ -2464,15 +2464,6 @@ function wp_update_comment( $commentarr, $wp_error = false ) {
 		}
 	}
 
-	$filter_comment = false;
-	if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
-		$filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
-	}
-
-	if ( $filter_comment ) {
-		add_filter( 'pre_comment_content', 'wp_filter_kses' );
-	}
-
 	// Escape data pulled from DB.
 	$comment = wp_slash( $comment );
 
@@ -2483,10 +2474,6 @@ function wp_update_comment( $commentarr, $wp_error = false ) {
 
 	$commentarr = wp_filter_comment( $commentarr );
 
-	if ( $filter_comment ) {
-		remove_filter( 'pre_comment_content', 'wp_filter_kses' );
-	}
-
 	// Now extract the merged array.
 	$data = wp_unslash( $commentarr );
 

wp-includes/customize/class-wp-customize-header-image-control.php

@@ -130,10 +130,10 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 			<# } else { #>
 
 			<button type="button" class="choice thumbnail"
-				data-customize-image-value="{{data.header.url}}"
+				data-customize-image-value="{{{data.header.url}}}"
 				data-customize-header-image-data="{{JSON.stringify(data.header)}}">
 				<span class="screen-reader-text"><?php _e( 'Set image' ); ?></span>
-				<img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
+				<img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
 			</button>
 
 			<# if ( data.type === 'uploaded' ) { #>
@@ -158,7 +158,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 
 				<# } else { #>
 
-			<img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
+			<img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
 
 				<# } #>
 			<# } else { #>

wp-includes/customize/class-wp-customize-site-icon-control.php

@@ -68,7 +68,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
 							<div class="favicon">
 								<img src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>" />
 							</div>
-							<span class="browser-title" aria-hidden="true"><# print( '<?php echo esc_js( get_bloginfo( 'name' ) ); ?>' ) #></span>
+							<span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
 						</div>
 						<img class="app-icon-preview" src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>" />
 					</div>

wp-includes/deprecated.php

@@ -4311,20 +4311,3 @@ function wp_skip_spacing_serialization( $block_type ) {
 function wp_add_iframed_editor_assets_html() {
 	_deprecated_function( __FUNCTION__, '6.0.0' );
 }
-
-/**
- * Filter the SQL clauses of an attachment query to include filenames.
- *
- * @since 4.7.0
- * @deprecated 6.0.3
- * @access private
- *
- * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
- *                       DISTINCT, fields (SELECT), and LIMITS clauses.
- * @return array The unmodified clauses.
- */
-function _filter_query_attachment_filenames( $clauses ) {
-	_deprecated_function( __FUNCTION__, '6.0.3', 'add_filter( "wp_allow_query_attachment_by_filename", "__return_true" )' );
-	remove_filter( 'posts_clauses', __FUNCTION__ );
-	return $clauses;
-}

wp-includes/formatting.php

@@ -2419,29 +2419,6 @@ function sanitize_html_class( $class, $fallback = '' ) {
 	return apply_filters( 'sanitize_html_class', $sanitized, $class, $fallback );
 }
 
-/**
- * Strips out all characters not allowed in a locale name.
- *
- * @since 6.2.1
- *
- * @param string $locale_name The locale name to be sanitized.
- * @return string The sanitized value.
- */
-function sanitize_locale_name( $locale_name ) {
-	// Limit to A-Z, a-z, 0-9, '_', '-'.
-	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $locale_name );
-
-	/**
-	 * Filters a sanitized locale name string.
-	 *
-	 * @since 6.2.1
-	 *
-	 * @param string $sanitized   The sanitized locale name.
-	 * @param string $locale_name The locale name before sanitization.
-	 */
-	return apply_filters( 'sanitize_locale_name', $sanitized, $locale_name );
-}
-
 /**
  * Converts lone & characters into `&` (a.k.a. `&`)
  *

wp-includes/functions.php

@@ -3580,12 +3580,10 @@ function wp_nonce_ays( $action ) {
 	} else {
 		$html = __( 'The link you followed has expired.' );
 		if ( wp_get_referer() ) {
-			$wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
-			$wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
 			$html .= '</p><p>';
 			$html .= sprintf(
 				'<a href="%s">%s</a>',
-				esc_url( $wp_http_referer ),
+				esc_url( remove_query_arg( 'updated', wp_get_referer() ) ),
 				__( 'Please try again.' )
 			);
 		}

wp-includes/js/media-audiovideo.js

@@ -506,7 +506,6 @@ VideoDetails = MediaDetails.extend(/** @lends wp.media.view.MediaFrame.VideoDeta
 
 			wp.ajax.send( 'set-attachment-thumbnail', {
 				data : {
-					_ajax_nonce: wp.media.view.settings.nonce.setAttachmentThumbnail,
 					urls: urls,
 					thumbnail_id: attachment.get( 'id' )
 				}

wp-includes/js/wp-embed.js

@@ -49,7 +49,6 @@
 
 		var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
 			blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ),
-			allowedProtocols = new RegExp( '^https?:$', 'i' ),
 			i, source, height, sourceURL, targetURL;
 
 		for ( i = 0; i < blockquotes.length; i++ ) {
@@ -85,11 +84,6 @@
 				sourceURL.href = source.getAttribute( 'src' );
 				targetURL.href = data.value;
 
-				/* Only follow link if the protocol is in the allow list. */
-				if ( ! allowedProtocols.test( targetURL.protocol ) ) {
-					continue;
-				}
-
 				/* Only continue if link hostname matches iframe's hostname. */
 				if ( targetURL.host === sourceURL.host ) {
 					if ( document.activeElement === source ) {

wp-includes/js/wp-embed.min.js

@@ -1,2 +1,2 @@
 /*! This file is auto-generated */
-!function(c,d){"use strict";var e=!1,o=!1;if(d.querySelector)if(c.addEventListener)e=!0;if(c.wp=c.wp||{},c.wp.receiveEmbedMessage);else if(c.wp.receiveEmbedMessage=function(e){var t=e.data;if(!t);else if(!(t.secret||t.message||t.value));else if(/[^a-zA-Z0-9]/.test(t.secret));else{for(var r,s,a,i=d.querySelectorAll('iframe[data-secret="'+t.secret+'"]'),n=d.querySelectorAll('blockquote[data-secret="'+t.secret+'"]'),o=new RegExp("^https?:$","i"),l=0;l<n.length;l++)n[l].style.display="none";for(l=0;l<i.length;l++)if(r=i[l],e.source!==r.contentWindow);else{if(r.removeAttribute("style"),"height"===t.message){if(1e3<(s=parseInt(t.value,10)))s=1e3;else if(~~s<200)s=200;r.height=s}if("link"===t.message)if(s=d.createElement("a"),a=d.createElement("a"),s.href=r.getAttribute("src"),a.href=t.value,!o.test(a.protocol));else if(a.host===s.host)if(d.activeElement===r)c.top.location.href=t.value}}},e)c.addEventListener("message",c.wp.receiveEmbedMessage,!1),d.addEventListener("DOMContentLoaded",t,!1),c.addEventListener("load",t,!1);function t(){if(o);else{o=!0;for(var e,t,r,s=-1!==navigator.appVersion.indexOf("MSIE 10"),a=!!navigator.userAgent.match(/Trident.*rv:11\./),i=d.querySelectorAll("iframe.wp-embedded-content"),n=0;n<i.length;n++){if(!(r=(t=i[n]).getAttribute("data-secret")))r=Math.random().toString(36).substr(2,10),t.src+="#?secret="+r,t.setAttribute("data-secret",r);if(s||a)(e=t.cloneNode(!0)).removeAttribute("security"),t.parentNode.replaceChild(e,t);t.contentWindow.postMessage({message:"ready",secret:r},"*")}}}}(window,document);
+!function(c,l){"use strict";var e=!1,o=!1;if(l.querySelector)if(c.addEventListener)e=!0;if(c.wp=c.wp||{},c.wp.receiveEmbedMessage);else if(c.wp.receiveEmbedMessage=function(e){var t=e.data;if(!t);else if(!(t.secret||t.message||t.value));else if(/[^a-zA-Z0-9]/.test(t.secret));else{for(var r,s,a,i=l.querySelectorAll('iframe[data-secret="'+t.secret+'"]'),n=l.querySelectorAll('blockquote[data-secret="'+t.secret+'"]'),o=0;o<n.length;o++)n[o].style.display="none";for(o=0;o<i.length;o++)if(r=i[o],e.source!==r.contentWindow);else{if(r.removeAttribute("style"),"height"===t.message){if(1e3<(s=parseInt(t.value,10)))s=1e3;else if(~~s<200)s=200;r.height=s}if("link"===t.message)if(s=l.createElement("a"),a=l.createElement("a"),s.href=r.getAttribute("src"),a.href=t.value,a.host===s.host)if(l.activeElement===r)c.top.location.href=t.value}}},e)c.addEventListener("message",c.wp.receiveEmbedMessage,!1),l.addEventListener("DOMContentLoaded",t,!1),c.addEventListener("load",t,!1);function t(){if(o);else{o=!0;for(var e,t,r,s=-1!==navigator.appVersion.indexOf("MSIE 10"),a=!!navigator.userAgent.match(/Trident.*rv:11\./),i=l.querySelectorAll("iframe.wp-embedded-content"),n=0;n<i.length;n++){if(!(r=(t=i[n]).getAttribute("data-secret")))r=Math.random().toString(36).substr(2,10),t.src+="#?secret="+r,t.setAttribute("data-secret",r);if(s||a)(e=t.cloneNode(!0)).removeAttribute("security"),t.parentNode.replaceChild(e,t);t.contentWindow.postMessage({message:"ready",secret:r},"*")}}}}(window,document);

wp-includes/kses.php

@@ -2371,7 +2371,6 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 			'direction',
 			'float',
 			'list-style-type',
-			'object-fit',
 			'object-position',
 			'overflow',
 			'vertical-align',

wp-includes/l10n.php

@@ -147,9 +147,9 @@ function determine_locale() {
 	$wp_lang = '';
 
 	if ( ! empty( $_GET['wp_lang'] ) ) {
-		$wp_lang = sanitize_locale_name( wp_unslash( $_GET['wp_lang'] ) );
+		$wp_lang = sanitize_text_field( $_GET['wp_lang'] );
 	} elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
-		$wp_lang = sanitize_locale_name( wp_unslash( $_COOKIE['wp_lang'] ) );
+		$wp_lang = sanitize_text_field( $_COOKIE['wp_lang'] );
 	}
 
 	if ( ! empty( $wp_lang ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {

wp-includes/media-template.php

@@ -1493,7 +1493,7 @@ function wp_print_media_templates() {
 			<div class="favicon">
 				<img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>" />
 			</div>
-			<span class="browser-title" aria-hidden="true"><# print( '<?php echo esc_js( get_bloginfo( 'name' ) ); ?>' ) #></span>
+			<span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
 		</div>
 
 		<strong aria-hidden="true"><?php _e( 'As an app icon' ); ?></strong>

wp-includes/media.php

@@ -2377,7 +2377,6 @@ function gallery_shortcode( $attr ) {
 			$attachments[ $val->ID ] = $_attachments[ $key ];
 		}
 	} elseif ( ! empty( $atts['exclude'] ) ) {
-		$post_parent_id = $id;
 		$attachments = get_children(
 			array(
 				'post_parent'    => $id,
@@ -2390,7 +2389,6 @@ function gallery_shortcode( $attr ) {
 			)
 		);
 	} else {
-		$post_parent_id = $id;
 		$attachments = get_children(
 			array(
 				'post_parent'    => $id,
@@ -2403,17 +2401,6 @@ function gallery_shortcode( $attr ) {
 		);
 	}
 
-	if ( ! empty( $post_parent_id ) ) {
-		$post_parent = get_post( $post_parent_id );
-
-		// terminate the shortcode execution if user cannot read the post or password-protected
-		if (
-		( ! is_post_publicly_viewable( $post_parent->ID ) && ! current_user_can( 'read_post', $post_parent->ID ) )
-		|| post_password_required( $post_parent ) ) {
-			return '';
-		}
-	}
-
 	if ( empty( $attachments ) ) {
 		return '';
 	}
@@ -2740,15 +2727,6 @@ function wp_playlist_shortcode( $attr ) {
 		$attachments         = get_children( $args );
 	}
 
-	if ( ! empty( $args['post_parent'] ) ) {
-		$post_parent = get_post( $id );
-
-		// terminate the shortcode execution if user cannot read the post or password-protected
-		if ( ! current_user_can( 'read_post', $post_parent->ID ) || post_password_required( $post_parent ) ) {
-			return '';
-		}
-	}
-
 	if ( empty( $attachments ) ) {
 		return '';
 	}
@@ -4433,8 +4411,7 @@ function wp_enqueue_media( $args = array() ) {
 		/** This filter is documented in wp-admin/includes/media.php */
 		'captions'          => ! apply_filters( 'disable_captions', '' ),
 		'nonce'             => array(
-			'sendToEditor'           => wp_create_nonce( 'media-send-to-editor' ),
-			'setAttachmentThumbnail' => wp_create_nonce( 'set-attachment-thumbnail' ),
+			'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
 		),
 		'post'              => array(
 			'id' => 0,

wp-includes/pluggable.php

@@ -91,6 +91,7 @@ if ( ! function_exists( 'get_user_by' ) ) :
 	 *
 	 * @since 2.8.0
 	 * @since 4.4.0 Added 'ID' as an alias of 'id' for the `$field` parameter.
+	 * @since 5.8.0 Returns the global `$current_user` if it's the user being fetched.
 	 *
 	 * @global WP_User $current_user The current user object which holds the user data.
 	 *
@@ -99,12 +100,18 @@ if ( ! function_exists( 'get_user_by' ) ) :
 	 * @return WP_User|false WP_User object on success, false on failure.
 	 */
 	function get_user_by( $field, $value ) {
+		global $current_user;
+
 		$userdata = WP_User::get_data_by( $field, $value );
 
 		if ( ! $userdata ) {
 			return false;
 		}
 
+		if ( $current_user instanceof WP_User && $current_user->ID === (int) $userdata->ID ) {
+			return $current_user;
+		}
+
 		$user = new WP_User;
 		$user->init( $userdata );
 
@@ -354,8 +361,6 @@ if ( ! function_exists( 'wp_mail' ) ) :
 		$phpmailer->clearAttachments();
 		$phpmailer->clearCustomHeaders();
 		$phpmailer->clearReplyTos();
-		$phpmailer->Body    = '';
-		$phpmailer->AltBody = '';
 
 		// Set "From" name and email.
 

wp-includes/post.php

@@ -7918,6 +7918,36 @@ function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
 	return $post_name;
 }
 
+/**
+ * Filters the SQL clauses of an attachment query to include filenames.
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param string[] $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
+ *                          DISTINCT, fields (SELECT), and LIMITS clauses.
+ * @return string[] The modified array of clauses.
+ */
+function _filter_query_attachment_filenames( $clauses ) {
+	global $wpdb;
+	remove_filter( 'posts_clauses', __FUNCTION__ );
+
+	// Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
+	$clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
+
+	$clauses['groupby'] = "{$wpdb->posts}.ID";
+
+	$clauses['where'] = preg_replace(
+		"/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
+		'$0 OR ( sq1.meta_value $1 $2 )',
+		$clauses['where']
+	);
+
+	return $clauses;
+}
+
 /**
  * Sets the last changed time for the 'posts' cache group.
  *

wp-includes/rest-api.php

@@ -1052,7 +1052,6 @@ function rest_cookie_check_errors( $result ) {
 	$result = wp_verify_nonce( $nonce, 'wp_rest' );
 
 	if ( ! $result ) {
-		add_filter( 'rest_send_nocache_headers', '__return_true', 20 );
 		return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie check failed' ), array( 'status' => 403 ) );
 	}
 

wp-includes/rest-api/class-wp-rest-server.php

@@ -330,6 +330,24 @@ class WP_REST_Server {
 
 		$this->send_header( 'Access-Control-Allow-Headers', implode( ', ', $allow_headers ) );
 
+		/**
+		 * Filters whether to send nocache headers on a REST API request.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
+		 */
+		$send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
+		if ( $send_no_cache_headers ) {
+			foreach ( wp_get_nocache_headers() as $header => $header_value ) {
+				if ( empty( $header_value ) ) {
+					$this->remove_header( $header );
+				} else {
+					$this->send_header( $header, $header_value );
+				}
+			}
+		}
+
 		/**
 		 * Filters whether the REST API is enabled.
 		 *
@@ -384,12 +402,10 @@ class WP_REST_Server {
 		 * $_GET['_method']. If that is not set, we check for the HTTP_X_HTTP_METHOD_OVERRIDE
 		 * header.
 		 */
-		$method_overridden = false;
 		if ( isset( $_GET['_method'] ) ) {
 			$request->set_method( $_GET['_method'] );
 		} elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) {
 			$request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
-			$method_overridden = true;
 		}
 
 		$result = $this->check_authentication();
@@ -449,28 +465,6 @@ class WP_REST_Server {
 		 */
 		$served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
 
-		/**
-		 * Filters whether to send nocache headers on a REST API request.
-		 *
-		 * @since 4.4.0
-		 * @since 6.x.x Moved the block to catch the filter added on rest_cookie_check_errors() from rest-api.php
-		 *
-		 * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
-		 */
-		$send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
-
-		// send no cache headers if the $send_no_cache_headers is true
-		// OR if the HTTP_X_HTTP_METHOD_OVERRIDE is used but resulted a 4xx response code.
-		if ( $send_no_cache_headers || ( true === $method_overridden && strpos( $code, '4' ) === 0 ) ) {
-			foreach ( wp_get_nocache_headers() as $header => $header_value ) {
-				if ( empty( $header_value ) ) {
-					$this->remove_header( $header );
-				} else {
-					$this->send_header( $header, $header_value );
-				}
-			}
-		}
-
 		if ( ! $served ) {
 			if ( 'HEAD' === $request->get_method() ) {
 				return null;

wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -97,7 +97,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 
 		// Filter query clauses to include filenames.
 		if ( isset( $query_args['s'] ) ) {
-			add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
+			add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
 		}
 
 		return $query_args;

wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php

@@ -144,35 +144,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 		);
 	}
 
-	/**
-	 * Checks if the terms for a post can be read.
-	 *
-	 * @since 6.0.3
-	 *
-	 * @param WP_Post         $post    Post object.
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool Whether the terms for the post can be read.
-	 */
-	public function check_read_terms_permission_for_post( $post, $request ) {
-		// If the requested post isn't associated with this taxonomy, deny access.
-		if ( ! is_object_in_taxonomy( $post->post_type, $this->taxonomy ) ) {
-			return false;
-		}
-
-		// Grant access if the post is publicly viewable.
-		if ( is_post_publicly_viewable( $post ) ) {
-			return true;
-		}
-
-		// Otherwise grant access if the post is readable by the logged in user.
-		if ( current_user_can( 'read_post', $post->ID ) ) {
-			return true;
-		}
-
-		// Otherwise, deny access.
-		return false;
-	}
-
 	/**
 	 * Checks if a request has access to read terms in the specified taxonomy.
 	 *
@@ -196,30 +167,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 			);
 		}
 
-		if ( ! empty( $request['post'] ) ) {
-			$post = get_post( $request['post'] );
-
-			if ( ! $post ) {
-				return new WP_Error(
-					'rest_post_invalid_id',
-					__( 'Invalid post ID.' ),
-					array(
-						'status' => 400,
-					)
-				);
-			}
-
-			if ( ! $this->check_read_terms_permission_for_post( $post, $request ) ) {
-				return new WP_Error(
-					'rest_forbidden_context',
-					__( 'Sorry, you are not allowed to view terms for this post.' ),
-					array(
-						'status' => rest_authorization_required_code(),
-					)
-				);
-			}
-		}
-
 		return true;
 	}
 

wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -318,9 +318,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		}
 
 		if ( ! empty( $prepared_args['search'] ) ) {
-			if ( ! current_user_can( 'list_users' ) ) {
-				$prepared_args['search_columns'] = array( 'ID', 'user_login', 'user_nicename', 'display_name' );
-			}
 			$prepared_args['search'] = '*' . $prepared_args['search'] . '*';
 		}
 		/**

wp-includes/shortcodes.php

@@ -170,45 +170,7 @@ function has_shortcode( $content, $tag ) {
 }
 
 /**
- * Returns a list of registered shortcode names found in the given content.
- *
- * Example usage:
- *
- *     get_shortcode_tags_in_content( '[audio src="file.mp3"][/audio] [foo] [gallery ids="1,2,3"]' );
- *     // array( 'audio', 'gallery' )
- *
- * @since 6.3.2
- *
- * @param string $content The content to check.
- * @return string[] An array of registered shortcode names found in the content.
- */
-function get_shortcode_tags_in_content( $content ) {
-	if ( false === strpos( $content, '[' ) ) {
-		return array();
-	}
-
-	preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
-	if ( empty( $matches ) ) {
-		return array();
-	}
-
-	$tags = array();
-	foreach ( $matches as $shortcode ) {
-		$tags[] = $shortcode[2];
-
-		if ( ! empty( $shortcode[5] ) ) {
-			$deep_tags = get_shortcode_tags_in_content( $shortcode[5] );
-			if ( ! empty( $deep_tags ) ) {
-				$tags = array_merge( $tags, $deep_tags );
-			}
-		}
-	}
-
-	return $tags;
-}
-
-/**
- * Searches content for shortcodes and filter shortcodes through their hooks.
+ * Search content for shortcodes and filter shortcodes through their hooks.
  *
  * This function is an alias for do_shortcode().
  *

wp-includes/user.php

@@ -1854,10 +1854,15 @@ function update_user_caches( $user ) {
  *
  * @since 3.0.0
  * @since 4.4.0 'clean_user_cache' action was added.
+ * @since 5.8.0 Refreshes the global user instance if cleaning the user cache for the current user.
+ *
+ * @global WP_User $current_user The current user object which holds the user data.
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
 function clean_user_cache( $user ) {
+	global $current_user;
+
 	if ( is_numeric( $user ) ) {
 		$user = new WP_User( $user );
 	}
@@ -1880,6 +1885,13 @@ function clean_user_cache( $user ) {
 	 * @param WP_User $user    User object.
 	 */
 	do_action( 'clean_user_cache', $user->ID, $user );
+
+	// Refresh the global user instance if the cleaning current user.
+	if ( get_current_user_id() === (int) $user->ID ) {
+		$user_id      = (int) $user->ID;
+		$current_user = null;
+		wp_set_current_user( $user_id, '' );
+	}
 }
 
 /**

wp-includes/version.php

@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0.6';
+$wp_version = '6.0.2';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

wp-includes/widgets.php

@@ -1578,7 +1578,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 
 	if ( is_wp_error( $rss ) ) {
 		if ( is_admin() || current_user_can( 'manage_options' ) ) {
-			echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $rss->get_error_message() ) . '</p>';
+			echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
 		}
 		return;
 	}
@@ -1701,7 +1701,7 @@ function wp_widget_rss_form( $args, $inputs = null ) {
 	$args['show_date']    = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
 
 	if ( ! empty( $args['error'] ) ) {
-		echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $args['error'] ) . '</p>';
+		echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $args['error'] . '</p>';
 	}
 
 	$esc_number = esc_attr( $args['number'] );

wp-mail.php

@@ -65,9 +65,6 @@ if ( 0 === $count ) {
 	wp_die( __( 'There does not seem to be any new mail.' ) );
 }
 
-// Always run as an unauthenticated user.
-wp_set_current_user( 0 );
-
 for ( $i = 1; $i <= $count; $i++ ) {
 
 	$message = $pop3->get( $i );
@@ -137,6 +134,8 @@ for ( $i = 1; $i <= $count; $i++ ) {
 				}
 				$author = sanitize_email( $author );
 				if ( is_email( $author ) ) {
+					/* translators: %s: Post author email address. */
+					echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
 					$userdata = get_user_by( 'email', $author );
 					if ( ! empty( $userdata ) ) {
 						$post_author  = $userdata->ID;

wp-trackback.php

@@ -13,9 +13,6 @@ if ( empty( $wp ) ) {
 	wp( array( 'tb' => '1' ) );
 }
 
-// Always run as an unauthenticated user.
-wp_set_current_user( 0 );
-
 /**
  * Response to a trackback.
  *