Changeset 36354 for branches/4.4/src/wp-includes/query.php

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)

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