bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-13 01:07:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

sphinx fixes upgrading 2.1.x -> 2.2.x

Browse Source
This commit is contained in:
SJ
2014-09-22 11:13:55 +02:00
parent 53c38a805d
commit 64f6aafeb3
3 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webui/model/search/search.php
View File

@ -417,10 +417,11 @@ class ModelSearchSearch extends Model {
$s = $this->fixup_sphinx_operators($s);
$q = $this->sphx->query("SELECT id FROM $sphx_table WHERE uid=" . $session->get("uid") . " AND MATCH('@$field $s') ");
$q = $this->sphx->query("SELECT iid FROM $sphx_table WHERE uid=" . $session->get("uid") . " AND MATCH('@$field $s') ");
if(ENABLE_SYSLOG == 1) { syslog(LOG_INFO, "sql: " . $q->query); }
foreach($q->rows as $a) {
$id_list .= "," . $a['id'];
$id_list .= "," . $a['iid'];
}
if($id_list) { $id_list = substr($id_list, 1, strlen($id_list)); }
@ -446,10 +447,10 @@ class ModelSearchSearch extends Model {
}
$q = $this->db->query("SELECT id FROM " . TABLE_FOLDER_MESSAGE . " WHERE folder_id IN ($q)", $__folders);
$q = $this->db->query("SELECT iid FROM " . TABLE_FOLDER_MESSAGE . " WHERE folder_id IN ($q)", $__folders);
foreach($q->rows as $a) {
$id_list .= "," . $a['id'];
$id_list .= "," . $a['iid'];
}
if($id_list) { $id_list = substr($id_list, 1, strlen($id_list)); }