diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index f5243c5880..b791c5b4c5 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -2469,7 +2469,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 785dcf933f..5b19d3b833 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1180,7 +1180,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-query.php b/wp-includes/class-wp-query.php
index 1e40bbc2d0..df7be734e6 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -437,6 +437,13 @@ class WP_Query {
private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
+ /**
+ * Controls whether an attachment query should include filenames or not.
+ *
+ * @since 6.0.3
+ * @var bool
+ */
+ protected $allow_query_attachment_by_filename = false;
/**
* Resets query flags to false.
*
@@ -1298,7 +1305,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 ';
}
@@ -1634,6 +1646,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 );
@@ -2038,7 +2060,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";
}
@@ -2111,6 +2133,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 374467f8bf..8b1e859e2d 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -2183,6 +2183,15 @@ function wp_update_comment($commentarr) {
return 0;
}
+ $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);
@@ -2193,6 +2202,10 @@ function wp_update_comment($commentarr) {
$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 edc8f891b2..0ea3a397f9 100644
--- a/wp-includes/customize/class-wp-customize-header-image-control.php
+++ b/wp-includes/customize/class-wp-customize-header-image-control.php
@@ -103,10 +103,10 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
<# } else { #>
<# if ( data.type === 'uploaded' ) { #>
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 4d7bcf525a..42ead494c7 100644
--- a/wp-includes/customize/class-wp-customize-site-icon-control.php
+++ b/wp-includes/customize/class-wp-customize-site-icon-control.php
@@ -66,7 +66,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
-
+
diff --git a/wp-includes/date.php b/wp-includes/date.php
index 591cf79319..c913c502a3 100644
--- a/wp-includes/date.php
+++ b/wp-includes/date.php
@@ -145,8 +145,8 @@ class WP_Date_Query {
* 'comment_date', 'comment_date_gmt'.
*/
public function __construct( $date_query, $default_column = 'post_date' ) {
- 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';
}
@@ -225,6 +225,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.
@@ -998,4 +1001,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/deprecated.php b/wp-includes/deprecated.php
index 89203d764c..04aa4fbfae 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -3952,3 +3952,21 @@ function wp_ajax_press_this_add_category() {
wp_send_json_error( array( 'errorMessage' => __( 'The Press This plugin is required.' ) ) );
}
}
+
+/**
+ * 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;
+}
+
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index ea9c2097d8..08d996896c 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -656,11 +656,11 @@ function wp_get_http_headers( $url, $deprecated = false ) {
/**
* Determines whether the publish date of the current post in the loop is different
* from the publish date of the previous post in the loop.
- *
+ *
* For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
* Conditional Tags} article in the Theme Developer Handbook.
- *
+ *
* @since 0.71
*
* @global string $currentday The day of the current post in the loop.
@@ -1351,9 +1351,9 @@ function do_robots() {
* cache, and the database goes away, then you might have problems.
*
* Checks for the 'siteurl' option for whether WordPress is installed.
- *
+ *
* For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
* Conditional Tags} article in the Theme Developer Handbook.
*
* @since 2.1.0
@@ -2412,7 +2412,7 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
} else {
if ( $type !== $real_mime ) {
/*
- * Everything else including image/* and application/*:
+ * Everything else including image/* and application/*:
* If the real content type doesn't match the file extension, assume it's dangerous.
*/
$type = $ext = false;
@@ -2421,7 +2421,7 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
}
}
- // The mime type must be allowed
+ // The mime type must be allowed
if ( $type ) {
$allowed = get_allowed_mime_types();
@@ -2695,9 +2695,12 @@ function wp_nonce_ays( $action ) {
} else {
$html = __( 'The link you followed has expired.' );
if ( wp_get_referer() ) {
- $html .= '
-
+
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index f5f794616c..edf1eba9ca 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -312,6 +312,8 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
$phpmailer->clearAttachments();
$phpmailer->clearCustomHeaders();
$phpmailer->clearReplyTos();
+ $phpmailer->Body = '';
+ $phpmailer->AltBody = '';
// From email and name
// If we don't have a name from the input headers
diff --git a/wp-includes/post.php b/wp-includes/post.php
index f65f1aed13..965b32b5a2 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -1018,9 +1018,9 @@ function is_post_type_hierarchical( $post_type ) {
/**
* Determines whether a post type is registered.
- *
+ *
* For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
* Conditional Tags} article in the Theme Developer Handbook.
*
* @since 3.0.0
@@ -1778,7 +1778,99 @@ function is_post_type_viewable( $post_type ) {
}
}
- return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
+ if ( ! is_object( $post_type ) ) {
+ return false;
+ }
+
+ $is_viewable = $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
+
+ /**
+ * Filters whether a post type is considered "viewable".
+ *
+ * The returned filtered value must be a boolean type to ensure
+ * `is_post_type_viewable()` only returns a boolean. This strictness
+ * is by design to maintain backwards-compatibility and guard against
+ * potential type errors in PHP 8.1+. Non-boolean values (even falsey
+ * and truthy values) will result in the function returning false.
+ *
+ * @since 5.9.0
+ *
+ * @param bool $is_viewable Whether the post type is "viewable" (strict type).
+ * @param WP_Post_Type $post_type Post type object.
+ */
+ return true === apply_filters( 'is_post_type_viewable', $is_viewable, $post_type );
+}
+
+/**
+ * Determines whether a post status is considered "viewable".
+ *
+ * For built-in post statuses such as publish and private, the 'public' value will be evaluated.
+ * For all others, the 'publicly_queryable' value will be used.
+ *
+ * @since 5.7.0
+ * @since 5.9.0 Added `is_post_status_viewable` hook to filter the result.
+ *
+ * @param string|stdClass $post_status Post status name or object.
+ * @return bool Whether the post status should be considered viewable.
+ */
+function is_post_status_viewable( $post_status ) {
+ if ( is_scalar( $post_status ) ) {
+ $post_status = get_post_status_object( $post_status );
+
+ if ( ! $post_status ) {
+ return false;
+ }
+ }
+
+ if (
+ ! is_object( $post_status ) ||
+ $post_status->internal ||
+ $post_status->protected
+ ) {
+ return false;
+ }
+
+ $is_viewable = $post_status->publicly_queryable || ( $post_status->_builtin && $post_status->public );
+
+ /**
+ * Filters whether a post status is considered "viewable".
+ *
+ * The returned filtered value must be a boolean type to ensure
+ * `is_post_status_viewable()` only returns a boolean. This strictness
+ * is by design to maintain backwards-compatibility and guard against
+ * potential type errors in PHP 8.1+. Non-boolean values (even falsey
+ * and truthy values) will result in the function returning false.
+ *
+ * @since 5.9.0
+ *
+ * @param bool $is_viewable Whether the post status is "viewable" (strict type).
+ * @param stdClass $post_status Post status object.
+ */
+ return true === apply_filters( 'is_post_status_viewable', $is_viewable, $post_status );
+}
+
+/**
+ * Determines whether a post is publicly viewable.
+ *
+ * Posts are considered publicly viewable if both the post status and post type
+ * are viewable.
+ *
+ * @since 5.7.0
+ *
+ * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
+ * @return bool Whether the post is publicly viewable.
+ */
+function is_post_publicly_viewable( $post = null ) {
+ $post = get_post( $post );
+
+ if ( ! $post ) {
+ return false;
+ }
+
+ $post_type = get_post_type( $post );
+ $post_status = get_post_status( $post );
+
+ return is_post_type_viewable( $post_type ) && is_post_status_viewable( $post_status );
}
/**
@@ -2044,11 +2136,11 @@ function get_post_custom_values( $key = '', $post_id = 0 ) {
*
* Sticky posts should remain at the top of The Loop. If the post ID is not
* given, then The Loop ID for the current post will be used.
- *
+ *
* For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
* Conditional Tags} article in the Theme Developer Handbook.
- *
+ *
* @since 2.7.0
*
* @param int $post_id Optional. Post ID. Default is ID of the global $post.
@@ -5026,11 +5118,11 @@ function get_pages( $args = array() ) {
/**
* Determines whether an attachment URI is local and really an attachment.
- *
+ *
* For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
* Conditional Tags} article in the Theme Developer Handbook.
- *
+ *
* @since 2.0.0
*
* @param string $url URL to check
@@ -5527,9 +5619,9 @@ function wp_attachment_is( $type, $post = null ) {
/**
* Determines whether an attachment is an image.
- *
+ *
* For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
* Conditional Tags} article in the Theme Developer Handbook.
*
* @since 2.1.0
@@ -6538,35 +6630,6 @@ function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
return $post_name;
}
-/**
- * Filter the SQL clauses of an attachment query to include filenames.
- *
- * @since 4.7.0
- * @access private
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
- * DISTINCT, fields (SELECT), and LIMITS clauses.
- * @return array The modified 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 2bcf08bdfc..5fc75f5f84 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
@@ -48,7 +48,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 c6d9da6d54..e7d995a9a4 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
@@ -126,6 +126,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.
*
@@ -136,12 +165,43 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
*/
public function get_items_permissions_check( $request ) {
$tax_obj = get_taxonomy( $this->taxonomy );
+
if ( ! $tax_obj || ! $this->check_is_taxonomy_allowed( $this->taxonomy ) ) {
return false;
}
+
if ( 'edit' === $request['context'] && ! current_user_can( $tax_obj->cap->edit_terms ) ) {
- return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) );
+ return new WP_Error(
+ 'rest_forbidden_context',
+ __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ),
+ array( 'status' => rest_authorization_required_code() )
+ );
}
+
+ 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 c86de84cb7..9b5cac1f3b 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -1408,7 +1408,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( is_wp_error($rss) ) {
if ( is_admin() || current_user_can('manage_options') )
- echo '