fixed a sphinx query

This commit is contained in:
SJ 2013-01-05 20:58:49 +01:00
parent bedb7b0acc
commit 28d12e9a52

View File

@ -186,7 +186,6 @@ class ModelSearchSearch extends Model {
if(RESTRICTED_AUDITOR == 1) { if(RESTRICTED_AUDITOR == 1) {
/* !!!FIXME!!! test this evaluation */
$domain_restrictions = ' (@todomain ' . $sd . ' | @fromdomain ' . $sd . ')'; $domain_restrictions = ' (@todomain ' . $sd . ' | @fromdomain ' . $sd . ')';
} }
@ -269,7 +268,8 @@ class ModelSearchSearch extends Model {
$data['any'] = $this->fixup_meta_characters($data['any']); $data['any'] = $this->fixup_meta_characters($data['any']);
$data['any'] = $this->fixup_sphinx_operators($data['any']); $data['any'] = $this->fixup_sphinx_operators($data['any']);
$data['any'] = $this->fix_email_address_for_sphinx($data['any']); $data['any'] = $this->fix_email_address_for_sphinx($data['any']);
if($match) { $match = "($match) & "; } $match .= "(" . $data['any'] . ") "; $fields = '';
if($match) { $match = "($match) & "; $fields = '@subject,@body '; } $match .= "($fields " . $data['any'] . ") ";
} }