Changeset 36404

Timestamp:

01/26/2016 03:11:12 AM (11 years ago)

Author:

boonebgorges

Message:

Query: Respect 'suppress_filters' when filtering search-related SQL.

Props 5um17.
Fixes #35594.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (2 diffs)
• tests/phpunit/tests/query/search.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -2791 +2791 @@
                 }
 
-                /**
-                 * Filter the search SQL that is used in the WHERE clause of WP_Query.
-                 *
-                 * @since 3.0.0
-                 *
-                 * @param string   $search Search SQL for WHERE clause.
-                 * @param WP_Query $this   The current WP_Query object.
-                 */
-                $search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) );
+                if ( ! $q['suppress_filters'] ) {
+                        /**
+                         * Filter the search SQL that is used in the WHERE clause of WP_Query.
+                         *
+                         * @since 3.0.0
+                         *
+                         * @param string   $search Search SQL for WHERE clause.
+                         * @param WP_Query $this   The current WP_Query object.
+                         */
+                        $search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) );
+                }
 
                 // Taxonomies
@@ -3008 +3010 @@
                                 $search_orderby = $this->parse_search_order( $q );
 
-                        /**
-                         * Filter the ORDER BY used when ordering search results.
-                         *
-                         * @since 3.7.0
-                         *
-                         * @param string   $search_orderby The ORDER BY clause.
-                         * @param WP_Query $this           The current WP_Query instance.
-                         */
-                        $search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
+                        if ( ! $q['suppress_filters'] ) {
+                                /**
+                                 * Filter the ORDER BY used when ordering search results.
+                                 *
+                                 * @since 3.7.0
+                                 *
+                                 * @param string   $search_orderby The ORDER BY clause.
+                                 * @param WP_Query $this           The current WP_Query instance.
+                                 */
+                                $search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
+                        }
+
                         if ( $search_orderby )
                                 $orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;

trunk/tests/phpunit/tests/query/search.php

@@ -160 +160 @@
                 $this->assertEqualSets( array( $p2 ), $q->posts );
         }
+
+        /**
+         * @ticket 35594
+         */
+        public function test_search_should_respect_suppress_filters() {
+                add_filter( 'posts_search', array( $this, 'filter_posts_search' ) );
+                add_filter( 'posts_search_orderby', array( $this, 'filter_posts_search' ) );
+                $q = new WP_Query( array(
+                        's' => 'foo',
+                        'suppress_filters' => true,
+                ) );
+                remove_filter( 'posts_search', array( $this, 'filter_posts_search' ) );
+                remove_filter( 'posts_search_orderby', array( $this, 'filter_posts_search' ) );
+
+                $this->assertNotContains( 'posts_search', $q->request );
+        }
+
+        public function filter_posts_search( $sql ) {
+                return $sql . ' /* posts_search */';
+        }
 }