Make WordPress Core


Ignore:
Timestamp:
10/17/2022 06:08:39 PM (20 months ago)
Author:
SergeyBiryukov
Message:

Grouped backports to the 4.7 branch.

  • Posts, Post types: Apply KSES to post-by-email content,
  • General: Validate host on "Are you sure?" screen,
  • Posts, Post types: Remove emails from post-by-email logs,
  • Media: Refactor search by filename within the admin,
  • Pings/trackbacks: Apply KSES to all trackbacks,
  • Comments: Apply kses when editing comments,
  • Customize: Escape blogname option in underscores templates,
  • REST API: Lockdown post parameter of the terms endpoint,
  • Mail: Reset PHPMailer properties between use,
  • Query: Validate relation in WP_Date_Query,
  • Widgets: Escape RSS error messages for display.

Merges [54521], [54522], [54523], [54524], [54525], [54526], [54527], [54528], [54529], [54530], [54541] to the 4.7 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, vortfu, davidbaumwald, tykoted, timothyblynjacobs, johnjamesjacoby, ehtis, matveb, talldanwp.

Location:
branches/4.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.7

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

    r47650 r54566  
    487487    private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
    488488
     489    /**
     490     * Controls whether an attachment query should include filenames or not.
     491     *
     492     * @since 6.0.3
     493     * @var bool
     494     */
     495    protected $allow_query_attachment_by_filename = false;
    489496    /**
    490497     * Resets query flags to false.
     
    13451352
    13461353            $like = $n . $wpdb->esc_like( $term ) . $n;
    1347             $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 );
     1354
     1355            if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
     1356                $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 );
     1357            } else {
     1358                $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 );
     1359            }
    13481360            $searchand = ' AND ';
    13491361        }
     
    16821694        $q = $this->fill_query_vars($q);
    16831695
     1696        /**
     1697         * Filters whether an attachment query should include filenames or not.
     1698         *
     1699         * @since 6.0.3
     1700         *
     1701         * @param bool $allow_query_attachment_by_filename Whether or not to include filenames.
     1702         */
     1703        $this->allow_query_attachment_by_filename = apply_filters( 'wp_allow_query_attachment_by_filename', false );
     1704        remove_all_filters( 'wp_allow_query_attachment_by_filename' );
     1705
    16841706        // Parse meta query
    16851707        $this->meta_query = new WP_Meta_Query();
     
    20782100        }
    20792101
    2080         if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
     2102        if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
    20812103            $groupby = "{$wpdb->posts}.ID";
    20822104        }
     
    21262148        }
    21272149        $where .= $search . $whichauthor . $whichmimetype;
     2150
     2151        if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
     2152            $join .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
     2153        }
    21282154
    21292155        if ( ! empty( $this->meta_query->queries ) ) {
Note: See TracChangeset for help on using the changeset viewer.