diff options
| -rw-r--r-- | inc/search.php | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/inc/search.php b/inc/search.php index 6a0b8fbd7..654f1ab69 100644 --- a/inc/search.php +++ b/inc/search.php @@ -318,21 +318,17 @@ function search_fulltext(&$data,$base,$file,$type,$lvl,$opts){ } } - // if only negwords are given the preg_match_all() call will - // crash libapache-mod-php4 v4.3.10-13 (segfault). Until we - // got to the bottom of this problem, at least one posword is - // required. - if(!count($poswords)) return true; - - $reg = count($poswords) ? '^(?=.*?'.join(')(?=.*?',$poswords).')' : '^'; + $req = count($poswords) ? $reg .= '^(?=.*?'.join(')(?=.*?',$poswords).')' : '^'; $reg .= count($negwords) ? '((?!'.join('|',$negwords).').)*$' : '.*$'; + $mark = '('.join('|',$poswords).')'; //do the fulltext search $matches = array(); if($cnt = preg_match_all('#'.$reg.'#usi',$lctext,$matches)){ //this is not the best way for snippet generation but the fastest I could find //split query and only use the first token - $q = $poswords[0]; + $q = preg_split('/\s+/',$opts['query'],2); + $q = $q[0]; $p = utf8_strpos($lctext,$q); $f = $p - 100; $l = utf8_strlen($q) + 200; @@ -340,7 +336,6 @@ function search_fulltext(&$data,$base,$file,$type,$lvl,$opts){ $snippet = '<span class="search_sep"> ... </span>'. htmlspecialchars(utf8_substr($text,$f,$l)). '<span class="search_sep"> ... </span>'; - $mark = '('.join('|',$poswords).')'; $snippet = preg_replace('#'.$mark.'#si','<span class="search_hit">\\1</span>',$snippet); $data[] = array( |