diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-11-01 18:04:54 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-11-01 18:04:54 +0000 |
| commit | 7ed7450890bf997a9005051f6bdcd7a6d0112e77 (patch) | |
| tree | a36721261d67c40b5322fe6b2bc5ad35357a2e55 | |
| parent | 963bcf0789148fb3aa9149581cb6d0791d2e641f (diff) | |
| parent | 4f370b6c237e85d5daa84edcc7d46990ea473b19 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/search/helpers/search.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.build_number b/.build_number index 5594e328..dd7bd0c9 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=178 +build_number=179 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); |