diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index a6f4a21e45..7d8f4c1b33 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -2974,7 +2974,7 @@ function wp_ajax_query_attachments() {
// Filter query clauses to include filenames.
if ( isset( $query['s'] ) ) {
- add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+ add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
}
/**
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 1a0fef056e..54233cdaef 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1269,7 +1269,7 @@ function wp_edit_attachments_query_vars( $q = false ) {
// Filter query clauses to include filenames.
if ( isset( $q['s'] ) ) {
- add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+ add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
}
return $q;
diff --git a/wp-includes/class-wp-date-query.php b/wp-includes/class-wp-date-query.php
index 5df12ade4c..4aeeac81d6 100644
--- a/wp-includes/class-wp-date-query.php
+++ b/wp-includes/class-wp-date-query.php
@@ -149,8 +149,8 @@ class WP_Date_Query {
return;
}
- if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
- $this->relation = 'OR';
+ if ( isset( $date_query['relation'] ) ) {
+ $this->relation = $this->sanitize_relation( $date_query['relation'] );
} else {
$this->relation = 'AND';
}
@@ -219,6 +219,9 @@ 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.
@@ -1039,4 +1042,20 @@ 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';
+ }
+ }
}
diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
index 339acdb520..59cb197e89 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -444,6 +444,13 @@ 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.
*
@@ -1394,7 +1401,12 @@ class WP_Query {
}
$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 );
+
+ 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 );
+ }
$searchand = ' AND ';
}
@@ -1789,6 +1801,16 @@ 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 );
@@ -2220,7 +2242,7 @@ class WP_Query {
}
}
- if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
+ if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
$groupby = "{$wpdb->posts}.ID";
}
@@ -2297,6 +2319,10 @@ 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'];
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 9539987ae7..ea20e85d5a 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -2461,6 +2461,15 @@ 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 );
@@ -2471,6 +2480,10 @@ 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 );
diff --git a/wp-includes/customize/class-wp-customize-header-image-control.php b/wp-includes/customize/class-wp-customize-header-image-control.php
index 82c1714261..701b9ea102 100644
--- a/wp-includes/customize/class-wp-customize-header-image-control.php
+++ b/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 { #>
<# if ( data.type === 'uploaded' ) { #>
@@ -158,7 +158,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
<# } else { #>
- 
+ 
<# } #>
<# } else { #>
diff --git a/wp-includes/customize/class-wp-customize-site-icon-control.php b/wp-includes/customize/class-wp-customize-site-icon-control.php
index d21395c39c..74823713dd 100644
--- a/wp-includes/customize/class-wp-customize-site-icon-control.php
+++ b/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
- <# print( '' ) #>
+ <# print( '' ) #>
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 72a23cd836..969a215637 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -4203,3 +4203,21 @@ function wp_sensitive_page_meta() {
';
$html .= sprintf(
'%s',
- esc_url( remove_query_arg( 'updated', wp_get_referer() ) ),
+ esc_url( $wp_http_referer ),
__( 'Please try again.' )
);
}
diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index 70e1995707..fbfed6dcbb 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -1493,7 +1493,7 @@ function wp_print_media_templates() {
- <# print( '' ) #>
+ <# print( '' ) #>
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index c53a723fc4..cb911375aa 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -350,6 +350,8 @@ if ( ! function_exists( 'wp_mail' ) ) :
$phpmailer->clearAttachments();
$phpmailer->clearCustomHeaders();
$phpmailer->clearReplyTos();
+ $phpmailer->Body = '';
+ $phpmailer->AltBody = '';
// Set "From" name and email.
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 0c6332b547..aa5c5c9643 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -7589,36 +7589,6 @@ 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.
*
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
index ea4ae947cc..7cd80f053e 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
@@ -89,7 +89,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
// Filter query clauses to include filenames.
if ( isset( $query_args['s'] ) ) {
- add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+ add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
}
return $query_args;
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
index 1d8d24dadc..5cab9b160f 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
@@ -134,6 +134,35 @@ 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.
*
@@ -157,6 +186,30 @@ 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;
}
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 1987023463..cb8df135dc 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -1526,7 +1526,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( is_wp_error( $rss ) ) {
if ( is_admin() || current_user_can( 'manage_options' ) ) {
- echo '' . __( 'RSS Error:' ) . ' ' . $rss->get_error_message() . '
';
+ echo '' . __( 'RSS Error:' ) . ' ' . esc_html( $rss->get_error_message() ) . '
';
}
return;
}
@@ -1649,7 +1649,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 '' . __( 'RSS Error:' ) . ' ' . $args['error'] . '
';
+ echo '' . __( 'RSS Error:' ) . ' ' . esc_html( $args['error'] ) . '
';
}
$esc_number = esc_attr( $args['number'] );
diff --git a/wp-mail.php b/wp-mail.php
index 1d5fbedf03..9b93176320 100644
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -65,6 +65,9 @@ if ( 0 === $count ) {
wp_die( __( 'There doesn’t 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 );
@@ -131,8 +134,6 @@ for ( $i = 1; $i <= $count; $i++ ) {
}
$author = sanitize_email( $author );
if ( is_email( $author ) ) {
- /* translators: %s: Post author email address. */
- echo '' . sprintf( __( 'Author is %s' ), $author ) . '
';
$userdata = get_user_by( 'email', $author );
if ( ! empty( $userdata ) ) {
$post_author = $userdata->ID;
diff --git a/wp-trackback.php b/wp-trackback.php
index 3d4f6056f5..4757727a58 100644
--- a/wp-trackback.php
+++ b/wp-trackback.php
@@ -13,6 +13,9 @@ if ( empty( $wp ) ) {
wp( array( 'tb' => '1' ) );
}
+// Always run as an unauthenticated user.
+wp_set_current_user( 0 );
+
/**
* Response to a trackback.
*