summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2011-11-01 18:04:54 +0000
committerNathan Kinkade <nath@nkinka.de>2011-11-01 18:04:54 +0000
commit7ed7450890bf997a9005051f6bdcd7a6d0112e77 (patch)
treea36721261d67c40b5322fe6b2bc5ad35357a2e55 /modules
parent963bcf0789148fb3aa9149581cb6d0791d2e641f (diff)
parent4f370b6c237e85d5daa84edcc7d46990ea473b19 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules')
-rw-r--r--modules/search/helpers/search.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index a77a2433..d6d67c29 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -53,7 +53,7 @@ class search_Core {
foreach (identity::group_ids_for_active_user() as $id) {
$fields[] = "`view_$id` = TRUE"; // access::ALLOW
}
- $access_sql = "AND (" . join(" OR ", $fields) . ")";
+ $access_sql = " AND (" . join(" OR ", $fields) . ")";
} else {
$access_sql = "";
}
@@ -122,7 +122,7 @@ class search_Core {
$score = $db->query($query)->current()->score;
$score = substr($score, 0, strlen($score) - 2);
- $data = $db->query(self::_build_query_base($q) . "having `score` >= " . $score);
+ $data = $db->query(self::_build_query_base($q) . " HAVING `score` >= " . $score);
$data->seek($data->count() - 1);