sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/branches/4.4@36354 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2016-01-20 04:37:13 +00:00
parent 4de2825d77
commit bbaa6b6f71
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wp-includes/query.php
View File

@ -2300,7 +2300,7 @@ class WP_Query {
$like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
}
$search_orderby = '(CASE ';
$search_orderby = '';
// sentence match in 'post_title'
if ( $like ) {
@ -2321,7 +2321,10 @@ class WP_Query {
if ( $like ) {
$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
$search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';

12
tests/phpunit/tests/query/search.php
View File

@ -125,4 +125,16 @@ class Tests_Query_Search extends WP_UnitTestCase {
$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 );
}
}