jonas/online-bookmarks
1
0
Fork 0
Code Releases Activity

Fixing error in search library

Browse Source
This commit is contained in:
Stefan Frech
2008-06-28 09:51:39 +00:00
committed by Jonas Kattendick
parent c25d9cbc46
commit 6b4bacaddb
1 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/BooleanSearch.php
View File

@@ -233,27 +233,33 @@ function assemble_query ($criteria, $searchfields) {
} //foreach $whereCriterias } //foreach $whereCriterias
$whereClause .= str_repeat(')', $nesting); $whereClause .= str_repeat(')', $nesting);
$whereClause = trim ($whereClause);
$query = sprintf ("SELECT bookmark.title, if ($whereClause != '') {
bookmark.url, $query = sprintf ("SELECT bookmark.title,
bookmark.description, bookmark.url,
UNIX_TIMESTAMP(bookmark.date) AS timestamp, bookmark.description,
bookmark.childof, UNIX_TIMESTAMP(bookmark.date) AS timestamp,
bookmark.id, bookmark.childof,
bookmark.favicon, bookmark.id,
bookmark.public, bookmark.favicon,
folder.name, bookmark.public,
folder.id AS fid, folder.name,
folder.public AS fpublic folder.id AS fid,
FROM bookmark LEFT JOIN folder ON bookmark.childof=folder.id folder.public AS fpublic
FROM bookmark LEFT JOIN folder ON bookmark.childof=folder.id
WHERE bookmark.user='%s' WHERE bookmark.user='%s'
AND bookmark.deleted!='1' AND bookmark.deleted!='1'
AND ( %s ) AND ( %s )
ORDER BY title", ORDER BY title",
$mysql->escape ($username), $mysql->escape ($username),
$whereClause); $whereClause);
}
else {
$query = false;
}
return $query; return $query;
} }