Make WordPress Core


Ignore:
Timestamp:
10/17/2022 05:46:39 PM (20 months ago)
Author:
audrasjb
Message:

Grouped backports to the 5.8 branch.

  • Editor: Bump @wordpress packages for the 5.9 branch,
  • Media: Refactor search by filename within the admin,
  • REST API: Lockdown post parameter of the terms endpoint,
  • Customize: Escape blogname option in underscores templates,
  • Query: Validate relation in WP_Date_Query,
  • Users: Revert use of shared objects for current user,
  • 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,
  • Pings/trackbacks: Apply KSES to all trackbacks,
  • Mail: Reset PHPMailer properties between use,
  • Comments: Apply kses when editing comments,
  • Widgets: Escape RSS error messages for display.

Merges [54521-54530] to the 5.8 branch.
Props audrasjb, costdev, cu121, dd32, davidbaumwald, ehtis, johnbillion, johnjamesjacoby, martinkrcho, matveb, oztaser, paulkevan, peterwilsoncc, ravipatel, SergeyBiryukov, talldanwp, timothyblynjacobs, tykoted, voldemortensen, vortfu, xknown.

Location:
branches/5.8
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/5.8

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

    r50576 r54548  
    445445    public $thumbnails_cached = false;
    446446
     447    /**
     448     * Controls whether an attachment query should include filenames or not.
     449     *
     450     * @since 6.0.3
     451     * @var bool
     452     */
     453    protected $allow_query_attachment_by_filename = false;
    447454    /**
    448455     * Cached list of search stopwords.
     
    13951402
    13961403            $like      = $n . $wpdb->esc_like( $term ) . $n;
    1397             $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 );
     1404
     1405            if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
     1406                $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 );
     1407            } else {
     1408                $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 );
     1409            }
    13981410            $searchand = ' AND ';
    13991411        }
     
    17901802        $q = $this->fill_query_vars( $q );
    17911803
     1804        /**
     1805         * Filters whether an attachment query should include filenames or not.
     1806         *
     1807         * @since 6.0.3
     1808         *
     1809         * @param bool $allow_query_attachment_by_filename Whether or not to include filenames.
     1810         */
     1811        $this->allow_query_attachment_by_filename = apply_filters( 'wp_allow_query_attachment_by_filename', false );
     1812        remove_all_filters( 'wp_allow_query_attachment_by_filename' );
     1813
    17921814        // Parse meta query.
    17931815        $this->meta_query = new WP_Meta_Query();
     
    22212243        }
    22222244
    2223         if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
     2245        if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
    22242246            $groupby = "{$wpdb->posts}.ID";
    22252247        }
     
    22972319        }
    22982320        $where .= $search . $whichauthor . $whichmimetype;
     2321
     2322        if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
     2323            $join .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
     2324        }
    22992325
    23002326        if ( ! empty( $this->meta_query->queries ) ) {
Note: See TracChangeset for help on using the changeset viewer.