Changeset 36354

Timestamp:

01/20/2016 04:37:13 AM (9 years ago)

Author:

dd32

Message:

Query: Avoid invalid SQL when building ORDER BY clause using long search strings.

The introduction of negative search terms in 4.4 [34934] introduced the
possibility that the ORDER BY clause of a search query could be assembled in
such a way as to create invalid syntax. The current changeset fixes this by
ensuring that the ORDER BY clause corresponding to the search terms is
excluded when it would otherwise be empty.

Merges [36251] to the 4.4 branch.
Props salvoaranzulla, boonebgorges.
Fixes #35361.

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-includes/query.php

@@ -2301 +2301 @@
             }
 
-            $search_orderby = '(CASE ';
+            $search_orderby = '';
 
             // sentence match in 'post_title'
@@ -2322 +2322 @@
                 $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 4 ", $like );
             }
-            $search_orderby .= 'ELSE 5 END)';
+
+            if ( $search_orderby ) {
+                $search_orderby = '(CASE ' . $search_orderby . 'ELSE 5 END)';
+            }
         } else {
             // single word or sentence search

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

@@ -126 +126 @@
         $this->assertEqualSets( array( $p3 ), $q->posts );
     }
+
+    /**
+     * @ticket 35361
+     */
+    public function test_search_orderby_should_be_empty_when_search_string_is_longer_than_6_words_and_exclusion_operator_is_used() {
+        $q = new WP_Query( array(
+            's' => 'foo1 foo2 foo3 foo4 foo5 foo6 foo7 -bar',
+            'fields' => 'ids',
+        ) );
+
+        $this->assertNotRegExp( '|ORDER BY \(CASE[^\)]+\)|', $q->request );
+    }
 }