Make WordPress Core


Ignore:
Timestamp:
08/06/2026 05:32:00 PM (3 months ago)
Author:
desrosj
Message:

Security: Backport the WordPress 7.0.3 security fixes to the 6.9 branch.

  • Users: Ensure a proper email address is used before sending email confirmations.
  • Formatting: Prevent stack overflow in safecss_filter_attr.
  • EmojI: Ensure that the emoji settings come from a script element.
  • Multisite: Enforce the active signup policy for existing users.
  • HTTP API: Improve compliance with IPv4 Special-Purpose Address Space.
  • Users: Prevent Usernames from mangling HTML
  • Comments: Exclude notes from comment feed queries.
  • Canonical: Only redirect for publicly viewable post types.
  • Administration: When wp_is_large_user_count(), ensure that the post author is always added to author dropdown.
  • Editor: Fix output of Post Date.
  • Editor: Ensure Content block tags always match available options.

Merges [63059],[63060],[63061],[63062],[63063],[63064],[63065],[63067],[62804] to the 6.9 branch.

Props xknown, westonruter, jeremyfelt, peterwilsoncc, paulkevan, lucasbustamante, jorbin, desrosj, vortfu, dmsnell, jonsurrell, davidbinda, johnbillion, ehtis, batmoo, lancewillett, wildworks, mukesh27, odkdn1, khokansardar, isabel_brison, bernhard-reiter, tyxla, aduth, talldanwp.

Location:
branches/6.9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/6.9

  • branches/6.9/src/wp-includes/class-wp-query.php

    r62775 r63077  
    28202820                        if ( $this->is_archive || $this->is_search ) {
    28212821                                $cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID ) $join ";
    2822                                 $cwhere   = "WHERE comment_approved = '1' $where";
     2822                                $cwhere   = "WHERE comment_approved = '1' AND {$wpdb->comments}.comment_type != 'note' $where";
    28232823                                $cgroupby = "{$wpdb->comments}.comment_id";
    28242824                        } else { // Other non-singular, e.g. front.
    28252825                                $cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID )";
    2826                                 $cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1'";
     2826                                $cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1' AND {$wpdb->comments}.comment_type != 'note'";
    28272827                                $cgroupby = '';
    28282828                        }
    … …  
    34823482
    34833483                        /** This filter is documented in wp-includes/query.php */
    3484                         $cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) );
     3484                        $cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1' AND {$wpdb->comments}.comment_type != 'note'", &$this ) );
    34853485
    34863486                        /** This filter is documented in wp-includes/query.php */
Note: See TracChangeset for help on using the changeset viewer.