Changeset 54559 for branches/5.4/src/wp-includes/class-wp-query.php

Timestamp:

10/17/2022 06:01:26 PM (2 years ago)

Author:

audrasjb

Message:

Grouped backports to the 5.4 branch.

• Editor: Bump @wordpress packages for the 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,
• 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.4 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.4

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-query.php (modified) (5 diffs)

branches/5.4/src/wp-includes/class-wp-query.php

@@ -442 +442 @@
     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.
@@ -1389 +1396 @@
             }
 
-            $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 );
+            $like = $n . $wpdb->esc_like( $term ) . $n;
+
+            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 ';
         }
@@ -1774 +1786 @@
         $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();
@@ -2205 +2227 @@
         }
 
-        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";
         }
@@ -2281 +2303 @@
         }
         $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 ) ) {