diff options
| author | nikrou <nikrou@piwigo.org> | 2010-07-05 21:18:45 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2010-07-05 21:18:45 +0000 |
| commit | b2d7edfc173228035f9dfadb73caa01e88b2b7e4 (patch) | |
| tree | 154f59b930b21f43e0cbae7b9dc37502dec0d776 /include/functions_search.inc.php | |
| parent | 52c568327c190455bce75a9b9f6317d659ef8e6c (diff) | |
Bug 1763 fixed : [PostgreSQL] double quote used in queries
Merge from trunk
git-svn-id: http://piwigo.org/svn/branches/2.1@6665 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions_search.inc.php')
| -rw-r--r-- | include/functions_search.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/functions_search.inc.php b/include/functions_search.inc.php index 425de3e6c..06fa6f423 100644 --- a/include/functions_search.inc.php +++ b/include/functions_search.inc.php @@ -393,7 +393,7 @@ function get_qsearch_like_clause($q, $field, $before='%', $after='%') continue; if ( strlen($tokens[$i])==0) continue; - $clauses[] = $field.' LIKE "'.$before.addslashes($tokens[$i]).$after.'"'; + $clauses[] = $field.' LIKE \''.$before.addslashes($tokens[$i]).$after.'\''; } return count($clauses) ? '('.implode(' OR ', $clauses).')' : null; @@ -434,7 +434,7 @@ function get_quick_search_results($q, $super_order_by, $images_where='') // Step 1 - first we find matches in #images table =========================== - $where_clauses='MATCH(i.name, i.comment) AGAINST( "'.$q.'" IN BOOLEAN MODE)'; + $where_clauses='MATCH(i.name, i.comment) AGAINST( \''.$q.'\' IN BOOLEAN MODE)'; if (!empty($q_like_clause)) { $where_clauses .= ' @@ -452,7 +452,7 @@ function get_quick_search_results($q, $super_order_by, $images_where='') ); $query = ' SELECT i.id, - MATCH(i.name, i.comment) AGAINST( "'.$q.'" IN BOOLEAN MODE) AS weight + MATCH(i.name, i.comment) AGAINST( \''.$q.'\' IN BOOLEAN MODE) AS weight FROM '.IMAGES_TABLE.' i WHERE '.implode("\n AND ", $where_clauses); @@ -505,7 +505,7 @@ SELECT id, name, permalink, nb_images FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id=cat_id WHERE user_id='.$user['id'].' - AND MATCH(name, comment) AGAINST( "'.$q.'" IN BOOLEAN MODE)'. + AND MATCH(name, comment) AGAINST( \''.$q.'\' IN BOOLEAN MODE)'. get_sql_condition_FandF ( array( 'visible_categories' => 'cat_id' ), "\n AND" ); |