Merge branch 'master' into 1.0.x

Conflicts: plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
parent de7ad991f9 12921d6b71
commit b4da5f3785
31 changed files with 313 additions and 42 deletions
--- a/plugins/SphinxSearch/sphinxsearch.php
+++ b/plugins/SphinxSearch/sphinxsearch.php
@@ -65,6 +65,9 @@ class SphinxSearch extends SearchEngine
    function query($q)
    {
        $result = $this->sphinx->query($q, $this->remote_table());
+        if ($result === false) {
+            throw new ServerException($this->sphinx->getLastError());
+        }
        if (!isset($result['matches'])) return false;
        $id_set = join(', ', array_keys($result['matches']));
        $this->target->whereAdd("id in ($id_set)");