Changeset 54562 for branches/5.3/tests/phpunit/tests/query/search.php

Timestamp:

10/17/2022 06:03:55 PM (4 years ago)

Author:

audrasjb

Message:

Grouped backports to the 5.3 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.3 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.3

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/query/search.php (modified) (5 diffs)

branches/5.3/tests/phpunit/tests/query/search.php

@@ -456 +456 @@
 
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type a string value.
@@ -486 +486 @@
 
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image2.png', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type an array value.
@@ -545 +545 @@
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image4.png', true );
                 add_post_meta( $attachment, '_test_meta_key', 'value', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type a string value.
@@ -585 +585 @@
 
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image5.png', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type a string value.
@@ -610 +610 @@
          * @ticket 22744
          */
-        public function test_filter_query_attachment_filenames_unhooks_itself() {
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
-
-                apply_filters(
-                        'posts_clauses',
-                        array(
-                                'where'    => '',
-                                'groupby'  => '',
-                                'join'     => '',
-                                'orderby'  => '',
-                                'distinct' => '',
-                                'fields'   => '',
-                                'limit'    => '',
-                        )
-                );
-
-                $result = has_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
-
-                $this->assertFalse( $result );
+        public function test_wp_query_removes_filter_wp_allow_query_attachment_by_filename() {
+                $attachment = self::factory()->post->create(
+                        array(
+                                'post_type'    => 'attachment',
+                                'post_status'  => 'publish',
+                                'post_title'   => 'bar foo',
+                                'post_content' => 'foo bar',
+                                'post_excerpt' => 'This post has foo',
+                        )
+                );
+
+                add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
+
+                $q = new WP_Query(
+                        array(
+                                's'           => 'image1',
+                                'fields'      => 'ids',
+                                'post_type'   => 'attachment',
+                                'post_status' => 'inherit',
+                        )
+                );
+
+                $this->assertSame( array( $attachment ), $q->posts );
+
+                /*
+                 * WP_Query should have removed the wp_allow_query_attachment_by_filename filter
+                 * and thus not match the attachment created above
+                 */
+                $q->get_posts();
+                $this->assertEmpty( $q->posts );
         }