From d977dfcf89de0215ca9a81f2a945f2626bf3c1c5 Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Sun, 25 Aug 2013 21:57:04 +0200
Subject: [PATCH] fixed a sphinx query bug

---
 util/db-upgrade-0.1.23-vs-0.1.24.sql | 18 ++++++++++++++++++
 webui/model/search/search.php        |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/util/db-upgrade-0.1.23-vs-0.1.24.sql b/util/db-upgrade-0.1.23-vs-0.1.24.sql
index 87e28a0d..28d08947 100644
--- a/util/db-upgrade-0.1.23-vs-0.1.24.sql
+++ b/util/db-upgrade-0.1.23-vs-0.1.24.sql
@@ -45,3 +45,21 @@ create table if not exists `online` (
    unique(`username`,`ipaddr`)
 ) Engine=InnoDB;
 
+create table if not exists `import` (
+   `id` int not null auto_increment primary key,
+   `type` varchar(255) not null,
+   `username` varchar(255) not null,
+   `password` varchar(255) not null,
+   `server` varchar(255) not null,
+   `created` int default 0,
+   `started` int default 0,
+   `finished` int default 0,
+   `updated` int default 0,
+   `status` int default 0,
+   `total` int default 0,
+   `imported` int default 0,
+   `duplicate` int default 0,
+   `error` int default 0,
+   `cleared` int default 0
+) Engine=InnoDB;
+
diff --git a/webui/model/search/search.php b/webui/model/search/search.php
index 0408e004..0411eeb6 100644
--- a/webui/model/search/search.php
+++ b/webui/model/search/search.php
@@ -269,7 +269,7 @@ class ModelSearchSearch extends Model {
          $data['any'] = $this->fixup_sphinx_operators($data['any']);
          $data['any'] = $this->fix_email_address_for_sphinx($data['any']);
          $fields = '';
-         if($match) { $match = "($match) & "; } $match .= "(@subject " . $data['any'] . " | @body " . $data['any'] . ") ";
+         if($match) { $match = "($match) & "; } $match .= "(@(subject,body) " . $data['any'] . ") ";
       }