From d4e7b22403bd5d36cc14914d3d52235fa0a99e53 Mon Sep 17 00:00:00 2001 From: Damien Regad Date: Mon, 18 Mar 2013 23:26:38 +0100 Subject: [PATCH] Revert "filter_api: ensure that the free_text where clauses are always ANDed" This reverts commit 543ba012999c20310a2208bd8e5f7f88efe392ce. --- core/filter_api.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/filter_api.php b/core/filter_api.php index 7b964b88ff..55edd46b16 100644 --- a/core/filter_api.php +++ b/core/filter_api.php @@ -1996,7 +1996,8 @@ function filter_get_bug_rows( &$p_page_number, &$p_per_page, &$p_page_count, &$p # add text query elements to arrays if ( !$t_first ) { $t_from_clauses[] = "$t_bug_text_table"; - $t_where_clauses[] = "$t_bug_table.bug_text_id = $t_bug_text_table.id AND $t_textsearch_where_clause"; + $t_where_clauses[] = "$t_bug_table.bug_text_id = $t_bug_text_table.id"; + $t_where_clauses[] = $t_textsearch_where_clause; $t_join_clauses[] = " LEFT JOIN $t_bugnote_table ON $t_bug_table.id = $t_bugnote_table.bug_id"; $t_join_clauses[] = " LEFT JOIN $t_bugnote_text_table ON $t_bugnote_table.bugnote_text_id = $t_bugnote_text_table.id"; }